[webbeans-commits] Webbeans SVN: r3744 - ri/tags.
by webbeans-commits＠lists.jboss.org
Author: rogerk
Date: 2009-09-22 13:41:44 -0400 (Tue, 22 Sep 2009)
New Revision: 3744
Added:
ri/tags/1.0.0.PREVIEW4/
Log:
1.0.0.PREVIEW4 tag from branch
Copied: ri/tags/1.0.0.PREVIEW4 (from rev 3743, ri/branches/1.0.0.PREVIEW4)
14 years, 7 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3743 - in ri/branches/1.0.0.PREVIEW4: api and 11 other directories.
by webbeans-commits＠lists.jboss.org
Author: rogerk
Date: 2009-09-22 13:38:51 -0400 (Tue, 22 Sep 2009)
New Revision: 3743
Modified:
ri/branches/1.0.0.PREVIEW4/api/pom.xml
ri/branches/1.0.0.PREVIEW4/core-api/pom.xml
ri/branches/1.0.0.PREVIEW4/embedded-tck-runner/pom.xml
ri/branches/1.0.0.PREVIEW4/impl/pom.xml
ri/branches/1.0.0.PREVIEW4/jboss-tck-runner/pom.xml
ri/branches/1.0.0.PREVIEW4/logging/pom.xml
ri/branches/1.0.0.PREVIEW4/osgi-bundle/pom.xml
ri/branches/1.0.0.PREVIEW4/parent/pom.xml
ri/branches/1.0.0.PREVIEW4/pom.xml
ri/branches/1.0.0.PREVIEW4/porting-package/pom.xml
ri/branches/1.0.0.PREVIEW4/spi/pom.xml
ri/branches/1.0.0.PREVIEW4/tests/pom.xml
ri/branches/1.0.0.PREVIEW4/version-matrix/pom.xml
Log:
1.0.0.PREVIEW4 staging branch
Modified: ri/branches/1.0.0.PREVIEW4/api/pom.xml
===================================================================
--- ri/branches/1.0.0.PREVIEW4/api/pom.xml 2009-09-22 16:48:45 UTC (rev 3742)
+++ ri/branches/1.0.0.PREVIEW4/api/pom.xml 2009-09-22 17:38:51 UTC (rev 3743)
@@ -4,12 +4,12 @@
<parent>
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW4</version>
</parent>
<groupId>org.jboss.webbeans</groupId>
<artifactId>jsr299-api</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW4</version>
<packaging>jar</packaging>
<name>JSR-299 API</name>
<url>http://www.seamframework.org/WebBeans</url>
Modified: ri/branches/1.0.0.PREVIEW4/core-api/pom.xml
===================================================================
--- ri/branches/1.0.0.PREVIEW4/core-api/pom.xml 2009-09-22 16:48:45 UTC (rev 3742)
+++ ri/branches/1.0.0.PREVIEW4/core-api/pom.xml 2009-09-22 17:38:51 UTC (rev 3743)
@@ -2,12 +2,12 @@
<parent>
<artifactId>webbeans-parent</artifactId>
<groupId>org.jboss.webbeans</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-api</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW4</version>
<name>Web Beans Core API</name>
<dependencies>
Modified: ri/branches/1.0.0.PREVIEW4/embedded-tck-runner/pom.xml
===================================================================
--- ri/branches/1.0.0.PREVIEW4/embedded-tck-runner/pom.xml 2009-09-22 16:48:45 UTC (rev 3742)
+++ ri/branches/1.0.0.PREVIEW4/embedded-tck-runner/pom.xml 2009-09-22 17:38:51 UTC (rev 3743)
@@ -2,7 +2,7 @@
<parent>
<artifactId>webbeans-parent</artifactId>
<groupId>org.jboss.webbeans</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.webbeans</groupId>
Modified: ri/branches/1.0.0.PREVIEW4/impl/pom.xml
===================================================================
--- ri/branches/1.0.0.PREVIEW4/impl/pom.xml 2009-09-22 16:48:45 UTC (rev 3742)
+++ ri/branches/1.0.0.PREVIEW4/impl/pom.xml 2009-09-22 17:38:51 UTC (rev 3743)
@@ -2,12 +2,12 @@
<parent>
<artifactId>webbeans-parent</artifactId>
<groupId>org.jboss.webbeans</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-core</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW4</version>
<name>Web Beans Core</name>
<dependencies>
Modified: ri/branches/1.0.0.PREVIEW4/jboss-tck-runner/pom.xml
===================================================================
--- ri/branches/1.0.0.PREVIEW4/jboss-tck-runner/pom.xml 2009-09-22 16:48:45 UTC (rev 3742)
+++ ri/branches/1.0.0.PREVIEW4/jboss-tck-runner/pom.xml 2009-09-22 17:38:51 UTC (rev 3743)
@@ -2,7 +2,7 @@
<parent>
<artifactId>webbeans-parent</artifactId>
<groupId>org.jboss.webbeans</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.webbeans</groupId>
Modified: ri/branches/1.0.0.PREVIEW4/logging/pom.xml
===================================================================
--- ri/branches/1.0.0.PREVIEW4/logging/pom.xml 2009-09-22 16:48:45 UTC (rev 3742)
+++ ri/branches/1.0.0.PREVIEW4/logging/pom.xml 2009-09-22 17:38:51 UTC (rev 3743)
@@ -2,12 +2,12 @@
<parent>
<artifactId>webbeans-parent</artifactId>
<groupId>org.jboss.webbeans</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-logging</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW4</version>
<name>Web Beans Logging</name>
<dependencies>
Modified: ri/branches/1.0.0.PREVIEW4/osgi-bundle/pom.xml
===================================================================
--- ri/branches/1.0.0.PREVIEW4/osgi-bundle/pom.xml 2009-09-22 16:48:45 UTC (rev 3742)
+++ ri/branches/1.0.0.PREVIEW4/osgi-bundle/pom.xml 2009-09-22 17:38:51 UTC (rev 3743)
@@ -21,7 +21,7 @@
<parent>
<artifactId>webbeans-parent</artifactId>
<groupId>org.jboss.webbeans</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -60,8 +60,8 @@
<Embed-Dependency>*; scope=compile; inline=true</Embed-Dependency>
<_exportcontents>javax.event; javax.context; javax.webbeans; javax.decorator; javax.inject; javax.enterprise.*; version=${osgi.version},
- org.jboss.webbeans.ejb; org.jboss.webbeans.bean.proxy; org.jboss.webbeans.*.api.*; org.jboss.webbeans.*.spi.*; org.jboss.webbeans.conversation; org.jboss.webbeans; org.jboss.webbeans.bootstrap; org.jboss.webbeans.introspector; org.jboss.webbeans.servlet; version=${osgi.version},
- org.jboss.webbeans.el; include:="WebBeansELResolver"; version=${osgi.version},
+ org.jboss.webbeans.context; org.jboss.webbeans.ejb; org.jboss.webbeans.bean.proxy; org.jboss.webbeans.*.api.*; org.jboss.webbeans.*.spi.*; org.jboss.webbeans.conversation; org.jboss.webbeans; org.jboss.webbeans.bootstrap; org.jboss.webbeans.introspector; org.jboss.webbeans.servlet; version=${osgi.version},
+ org.jboss.webbeans.el; version=${osgi.version},
org.jboss.webbeans.jsf; include:="WebBeansPhaseListener"; version=${osgi.version},
javassist.util.proxy;version="3.8.1.GA"
</_exportcontents>
@@ -129,7 +129,13 @@
<groupId>com.google.collections</groupId>
<artifactId>google-collections</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.inject</groupId>
+ <artifactId>inject-api</artifactId>
+ <version>1.0.0-PRD</version>
+ </dependency>
+
</dependencies>
</project>
Modified: ri/branches/1.0.0.PREVIEW4/parent/pom.xml
===================================================================
--- ri/branches/1.0.0.PREVIEW4/parent/pom.xml 2009-09-22 16:48:45 UTC (rev 3742)
+++ ri/branches/1.0.0.PREVIEW4/parent/pom.xml 2009-09-22 17:38:51 UTC (rev 3743)
@@ -3,12 +3,12 @@
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-parent</artifactId>
<packaging>pom</packaging>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW4</version>
<parent>
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-version-matrix</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW4</version>
</parent>
<name>Web Beans, the reference implementation of JSR-299</name>
Modified: ri/branches/1.0.0.PREVIEW4/pom.xml
===================================================================
--- ri/branches/1.0.0.PREVIEW4/pom.xml 2009-09-22 16:48:45 UTC (rev 3742)
+++ ri/branches/1.0.0.PREVIEW4/pom.xml 2009-09-22 17:38:51 UTC (rev 3743)
@@ -3,7 +3,7 @@
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-build-aggregator</artifactId>
<packaging>pom</packaging>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW4</version>
<name>Web Beans Build Aggregator</name>
<url>http://www.seamframework.org/WebBeans</url>
@@ -56,9 +56,9 @@
<module>core-api</module>
<module>logging</module>
<module>impl</module>
- <module>tests</module>
- <module>porting-package</module>
- <module>jboss-tck-runner</module>
+<!-- <module>tests</module> -->
+<!-- <module>porting-package</module> -->
+<!-- <module>jboss-tck-runner</module> -->
<module>osgi-bundle</module>
</modules>
</profile>
Modified: ri/branches/1.0.0.PREVIEW4/porting-package/pom.xml
===================================================================
--- ri/branches/1.0.0.PREVIEW4/porting-package/pom.xml 2009-09-22 16:48:45 UTC (rev 3742)
+++ ri/branches/1.0.0.PREVIEW4/porting-package/pom.xml 2009-09-22 17:38:51 UTC (rev 3743)
@@ -2,12 +2,12 @@
<parent>
<artifactId>webbeans-parent</artifactId>
<groupId>org.jboss.webbeans</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-porting-package</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW4</version>
<name>Web Beans Porting Package for JSR-299 TCK</name>
<dependencies>
Modified: ri/branches/1.0.0.PREVIEW4/spi/pom.xml
===================================================================
--- ri/branches/1.0.0.PREVIEW4/spi/pom.xml 2009-09-22 16:48:45 UTC (rev 3742)
+++ ri/branches/1.0.0.PREVIEW4/spi/pom.xml 2009-09-22 17:38:51 UTC (rev 3743)
@@ -2,12 +2,12 @@
<parent>
<artifactId>webbeans-parent</artifactId>
<groupId>org.jboss.webbeans</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-spi</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW4</version>
<name>Web Beans Service Provider Interfaces</name>
<dependencies>
Modified: ri/branches/1.0.0.PREVIEW4/tests/pom.xml
===================================================================
--- ri/branches/1.0.0.PREVIEW4/tests/pom.xml 2009-09-22 16:48:45 UTC (rev 3742)
+++ ri/branches/1.0.0.PREVIEW4/tests/pom.xml 2009-09-22 17:38:51 UTC (rev 3743)
@@ -2,12 +2,12 @@
<parent>
<artifactId>webbeans-parent</artifactId>
<groupId>org.jboss.webbeans</groupId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-core-test</artifactId>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW4</version>
<name>Web Beans Core Tests</name>
<dependencies>
Modified: ri/branches/1.0.0.PREVIEW4/version-matrix/pom.xml
===================================================================
--- ri/branches/1.0.0.PREVIEW4/version-matrix/pom.xml 2009-09-22 16:48:45 UTC (rev 3742)
+++ ri/branches/1.0.0.PREVIEW4/version-matrix/pom.xml 2009-09-22 17:38:51 UTC (rev 3743)
@@ -3,7 +3,7 @@
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-version-matrix</artifactId>
<packaging>pom</packaging>
- <version>1.0.0-SNAPSHOT</version>
+ <version>1.0.0.PREVIEW4</version>
<name>Web Beans Version Matrix</name>
<url>http://www.seamframework.org/WebBeans</url>
@@ -48,10 +48,10 @@
<properties>
<jsr299.tck.version>1.0.0-SNAPSHOT</jsr299.tck.version>
- <webbeans.version>1.0.0-SNAPSHOT</webbeans.version>
- <webbeans.servlet.version>1.0.0-SNAPSHOT</webbeans.servlet.version>
- <webbeans.se.version>1.0.0-SNAPSHOT</webbeans.se.version>
- <jboss.test.harness.version>1.0.0-SNAPSHOT</jboss.test.harness.version>
+ <webbeans.version>1.0.0.PREVIEW4</webbeans.version>
+ <webbeans.servlet.version>1.0.0.CR1</webbeans.servlet.version>
+ <webbeans.se.version>1.0.0.PREVIEW4</webbeans.se.version>
+ <jboss.test.harness.version>1.0.0.PREVIEW4</jboss.test.harness.version>
</properties>
<dependencyManagement>
@@ -128,7 +128,7 @@
<groupId>javax.servlet.jsp</groupId>
<artifactId>jsp-api</artifactId>
<version>2.1</version>
- </dependency>
+ </dependency>
<dependency>
<groupId>javax.transaction</groupId>
@@ -276,11 +276,13 @@
<version>${webbeans.version}</version>
</dependency>
+<!--
<dependency>
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-core-test</artifactId>
<version>${webbeans.version}</version>
</dependency>
+-->
<dependency>
<groupId>org.jboss.webbeans</groupId>
@@ -307,11 +309,13 @@
<version>${webbeans.servlet.version}</version>
</dependency>
+<!--
<dependency>
<groupId>org.jboss.jsr299.tck</groupId>
<artifactId>jsr299-tck-api</artifactId>
<version>${jsr299.tck.version}</version>
</dependency>
+-->
<dependency>
<groupId>org.jboss.jsr299.tck</groupId>
@@ -339,12 +343,6 @@
<dependency>
<groupId>org.jboss.test-harness</groupId>
- <artifactId>jboss-test-harness-jboss-embedded</artifactId>
- <version>${jboss.test.harness.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.test-harness</groupId>
<artifactId>jboss-test-harness-tomcat</artifactId>
<version>${jboss.test.harness.version}</version>
</dependency>
@@ -352,7 +350,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>catalina</artifactId>
- <version>6.0.20</version>
+ <version>6.0.18</version>
</dependency>
<dependency>
@@ -553,8 +551,8 @@
</distributionManagement>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/ri/trunk/version-matrix</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/webbeans/ri/trunk/version-matrix</developerConnection>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/webbeans/ri/tags/1.0.0.PREVIEW4/ve...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/webbeans/ri/tags/1.0.0.PREVIEW4/versi...</developerConnection>
<url>http://fisheye.jboss.org/browse/WebBeans/ri</url>
</scm>
14 years, 7 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3742 - ri/branches.
by webbeans-commits＠lists.jboss.org
Author: rogerk
Date: 2009-09-22 12:48:45 -0400 (Tue, 22 Sep 2009)
New Revision: 3742
Added:
ri/branches/1.0.0.PREVIEW4/
Log:
1.0.0.PREVIEW4 branch
Copied: ri/branches/1.0.0.PREVIEW4 (from rev 3741, ri/trunk)
14 years, 7 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3741 - in examples/trunk: jsf/translator and 1 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-09-22 11:43:01 -0400 (Tue, 22 Sep 2009)
New Revision: 3741
Modified:
examples/trunk/build.xml
examples/trunk/jsf/translator/build.xml
examples/trunk/jsf/translator/ejb/src/main/java/org/jboss/webbeans/examples/translator/TextTranslator.java
examples/trunk/jsf/translator/ejb/src/main/java/org/jboss/webbeans/examples/translator/TranslatorControllerBean.java
Log:
fix build errors
Modified: examples/trunk/build.xml
===================================================================
--- examples/trunk/build.xml 2009-09-22 15:32:41 UTC (rev 3740)
+++ examples/trunk/build.xml 2009-09-22 15:43:01 UTC (rev 3741)
@@ -25,7 +25,7 @@
<condition property="artifact.target.dir" value="${basedir}/target">
<equals arg1="${type}" arg2="war" />
</condition>
- <condition property="artifact.target.dir" value="${basedir}/${example.name}-ear/target">
+ <condition property="artifact.target.dir" value="${basedir}/ear/target">
<equals arg1="${type}" arg2="ear" />
</condition>
Modified: examples/trunk/jsf/translator/build.xml
===================================================================
--- examples/trunk/jsf/translator/build.xml 2009-09-22 15:32:41 UTC (rev 3740)
+++ examples/trunk/jsf/translator/build.xml 2009-09-22 15:43:01 UTC (rev 3741)
@@ -3,6 +3,6 @@
<property name="example.name" value="webbeans-translator" />
<property name="type" value="ear" />
- <import file="../build.xml" />
+ <import file="../../build.xml" />
</project>
Modified: examples/trunk/jsf/translator/ejb/src/main/java/org/jboss/webbeans/examples/translator/TextTranslator.java
===================================================================
--- examples/trunk/jsf/translator/ejb/src/main/java/org/jboss/webbeans/examples/translator/TextTranslator.java 2009-09-22 15:32:41 UTC (rev 3740)
+++ examples/trunk/jsf/translator/ejb/src/main/java/org/jboss/webbeans/examples/translator/TextTranslator.java 2009-09-22 15:43:01 UTC (rev 3741)
@@ -3,7 +3,7 @@
import java.io.Serializable;
import javax.ejb.EJB;
-import javax.enterprise.inject.Initializer;
+import javax.inject.Inject;
public class TextTranslator implements Serializable
{
@@ -11,8 +11,8 @@
@EJB Translator translator;
- @Initializer
- TextTranslator(SentenceParser sentenceParser)
+ @Inject
+ public TextTranslator(SentenceParser sentenceParser)
{
this.sentenceParser = sentenceParser;
}
Modified: examples/trunk/jsf/translator/ejb/src/main/java/org/jboss/webbeans/examples/translator/TranslatorControllerBean.java
===================================================================
--- examples/trunk/jsf/translator/ejb/src/main/java/org/jboss/webbeans/examples/translator/TranslatorControllerBean.java 2009-09-22 15:32:41 UTC (rev 3740)
+++ examples/trunk/jsf/translator/ejb/src/main/java/org/jboss/webbeans/examples/translator/TranslatorControllerBean.java 2009-09-22 15:43:01 UTC (rev 3741)
@@ -3,8 +3,8 @@
import javax.ejb.Remove;
import javax.ejb.Stateful;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Current;
-import javax.enterprise.inject.Named;
+import javax.inject.Inject;
+import javax.inject.Named;
@Stateful
@RequestScoped
@@ -12,7 +12,8 @@
public class TranslatorControllerBean implements TranslatorController
{
- @Current TextTranslator translator;
+ @Inject
+ private TextTranslator translator;
private String inputText;
14 years, 7 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3740 - examples/trunk.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-09-22 11:32:41 -0400 (Tue, 22 Sep 2009)
New Revision: 3740
Modified:
examples/trunk/build.xml
Log:
ws
Modified: examples/trunk/build.xml
===================================================================
--- examples/trunk/build.xml 2009-09-22 15:30:12 UTC (rev 3739)
+++ examples/trunk/build.xml 2009-09-22 15:32:41 UTC (rev 3740)
@@ -1,122 +1,122 @@
<project basedir="." name="example.build.script" default="restart">
<dirname property="wbexamples.dir" file="${ant.file.example.build.script}" />
-
+
<property name="maven.dir" location="${wbexamples.dir}/lib/maven" />
-
- <property file="${wbexamples.dir}/../jboss-as/local.build.properties"/>
- <property file="${wbexamples.dir}/local.build.properties"/>
- <property file="${wbexamples.dir}/build.properties"/>
- <property file="${wbexamples.dir}/../jboss-as/build.properties"/>
-
+
+ <property file="${wbexamples.dir}/../jboss-as/local.build.properties" />
+ <property file="${wbexamples.dir}/local.build.properties" />
+ <property file="${wbexamples.dir}/build.properties" />
+ <property file="${wbexamples.dir}/../jboss-as/build.properties" />
+
<property name="final.url" value="http://localhost:8080/${example.name}" />
-
+
<property name="pom.file" value="pom.xml" />
-
+
<property name="type" value="war" />
-
+
<condition property="war">
- <equals arg1="${type}" arg2="war"/>
+ <equals arg1="${type}" arg2="war" />
</condition>
<condition property="ear">
- <equals arg1="${type}" arg2="ear"/>
- </condition>
-
+ <equals arg1="${type}" arg2="ear" />
+ </condition>
+
<condition property="artifact.target.dir" value="${basedir}/target">
- <equals arg1="${type}" arg2="war"/>
+ <equals arg1="${type}" arg2="war" />
</condition>
<condition property="artifact.target.dir" value="${basedir}/${example.name}-ear/target">
- <equals arg1="${type}" arg2="ear"/>
- </condition>
-
+ <equals arg1="${type}" arg2="ear" />
+ </condition>
+
<property name="artifact.dir" value="${artifact.target.dir}/${example.name}" />
-
+
<target name="package">
<maven target="package" basedir="${basedir}">
- <arg line="-f ${pom.file}" />
+ <arg line="-f ${pom.file}" />
</maven>
</target>
-
+
<target name="explode" depends="package">
- <mkdir dir="${jboss.home}/server/default/deploy/${example.name}.${type}"/>
+ <mkdir dir="${jboss.home}/server/default/deploy/${example.name}.${type}" />
<copy todir="${jboss.home}/server/default/deploy/${example.name}.${type}">
- <fileset dir="${artifact.dir}" />
+ <fileset dir="${artifact.dir}" />
</copy>
</target>
-
- <target name="tomcat.explode" depends="package">
- <mkdir dir="${tomcat.home}/webapps/${example.name}"/>
- <copy todir="${tomcat.home}/webapps/${example.name}">
- <fileset dir="${artifact.dir}" />
- </copy>
- </target>
-
+
+ <target name="tomcat.explode" depends="package">
+ <mkdir dir="${tomcat.home}/webapps/${example.name}" />
+ <copy todir="${tomcat.home}/webapps/${example.name}">
+ <fileset dir="${artifact.dir}" />
+ </copy>
+ </target>
+
<target name="deploy" depends="package">
- <copy todir="${jboss.home}/server/default/deploy/" file="${artifact.target.dir}/${example.name}.${type}"/>
+ <copy todir="${jboss.home}/server/default/deploy/" file="${artifact.target.dir}/${example.name}.${type}" />
<echo message="The app can be accessed at ${final.url}" />
</target>
-
- <target name="tomcat.deploy" depends="package">
- <copy todir="${tomcat.home}/webapps/" file="${artifact.target.dir}/${example.name}.${type}"/>
- <echo message="The app can be accessed at ${final.url}" />
- </target>
-
+
+ <target name="tomcat.deploy" depends="package">
+ <copy todir="${tomcat.home}/webapps/" file="${artifact.target.dir}/${example.name}.${type}" />
+ <echo message="The app can be accessed at ${final.url}" />
+ </target>
+
<target name="clean">
<maven target="clean" basedir="${basedir}">
<arg line="-f ${pom.file}" />
- </maven>
+ </maven>
</target>
-
+
<target name="restart.war" depends="explode" if="war">
<touch file="${jboss.home}/server/default/deploy/${example.name}.war/WEB-INF/web.xml" />
</target>
-
+
<target name="tomcat.restart" depends="tomcat.explode" if="war">
- <touch file="${tomcat.home}/webapps/${example.name}/WEB-INF/web.xml" />
- </target>
-
+ <touch file="${tomcat.home}/webapps/${example.name}/WEB-INF/web.xml" />
+ </target>
+
<target name="restart.ear" depends="explode" if="ear">
- <touch file="${jboss.home}/server/default/deploy/${example.name}.ear/META-INF/application.xml" />
- </target>
-
+ <touch file="${jboss.home}/server/default/deploy/${example.name}.ear/META-INF/application.xml" />
+ </target>
+
<target name="restart" depends="restart.war, restart.ear">
<echo message="The app can be accessed at ${final.url}" />
</target>
-
+
<target name="undeploy">
<delete dir="${jboss.home}/server/default/deploy/${example.name}.${type}" failonerror="false" />
- <delete file="${jboss.home}/server/default/deploy/${example.name}.${type}" failonerror="false" />
+ <delete file="${jboss.home}/server/default/deploy/${example.name}.${type}" failonerror="false" />
</target>
-
- <target name="tomcat.undeploy">
- <delete file="${tomcat.home}/webapps/${example.name}.war" failonerror="false" />
- </target>
- <target name="tomcat.unexplode">
- <delete dir="${tomcat.home}/webapps/${example.name}" failonerror="false" />
- </target>
+ <target name="tomcat.undeploy">
+ <delete file="${tomcat.home}/webapps/${example.name}.war" failonerror="false" />
+ </target>
-
- <macrodef name="maven">
- <attribute name="target" />
- <attribute name="basedir" />
- <element name="args" implicit="true" optional="true" />
- <sequential>
- <java classname="org.codehaus.classworlds.Launcher" fork="true" dir="@{basedir}" failonerror="true">
- <classpath>
- <fileset dir="${maven.dir}/boot">
- <include name="*.jar" />
- </fileset>
- <fileset dir="${maven.dir}/bin">
- <include name="*.*" />
- </fileset>
- </classpath>
- <sysproperty key="classworlds.conf" value="${maven.dir}/bin/m2.conf" />
- <sysproperty key="maven.home" value="${maven.dir}" />
- <args />
- <arg line="@{target}" />
- </java>
- </sequential>
- </macrodef>
-
+ <target name="tomcat.unexplode">
+ <delete dir="${tomcat.home}/webapps/${example.name}" failonerror="false" />
+ </target>
+
+
+ <macrodef name="maven">
+ <attribute name="target" />
+ <attribute name="basedir" />
+ <element name="args" implicit="true" optional="true" />
+ <sequential>
+ <java classname="org.codehaus.classworlds.Launcher" fork="true" dir="@{basedir}" failonerror="true">
+ <classpath>
+ <fileset dir="${maven.dir}/boot">
+ <include name="*.jar" />
+ </fileset>
+ <fileset dir="${maven.dir}/bin">
+ <include name="*.*" />
+ </fileset>
+ </classpath>
+ <sysproperty key="classworlds.conf" value="${maven.dir}/bin/m2.conf" />
+ <sysproperty key="maven.home" value="${maven.dir}" />
+ <args />
+ <arg line="@{target}" />
+ </java>
+ </sequential>
+ </macrodef>
+
</project>
14 years, 7 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3739 - in examples/trunk/se: hello-world/src/main/java/org/jboss/webbeans/environment/se/example/simple and 2 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-09-22 11:30:12 -0400 (Tue, 22 Sep 2009)
New Revision: 3739
Modified:
examples/trunk/se/hello-world/pom.xml
examples/trunk/se/hello-world/src/main/java/org/jboss/webbeans/environment/se/example/simple/CommandLineArgsValidator.java
examples/trunk/se/hello-world/src/main/java/org/jboss/webbeans/environment/se/example/simple/HelloWorld.java
examples/trunk/se/numberguess/pom.xml
examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Game.java
examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Generator.java
examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MaxNumber.java
examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MessageGenerator.java
examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/NumberGuessFrame.java
examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Random.java
Log:
ws
Modified: examples/trunk/se/hello-world/pom.xml
===================================================================
--- examples/trunk/se/hello-world/pom.xml 2009-09-22 15:27:41 UTC (rev 3738)
+++ examples/trunk/se/hello-world/pom.xml 2009-09-22 15:30:12 UTC (rev 3739)
@@ -1,90 +1,91 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>webbeans-examples-parent</artifactId>
- <groupId>org.jboss.webbeans.examples</groupId>
- <version>1.0.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.webbeans.examples.se</groupId>
- <artifactId>webbeans-se-hello-world</artifactId>
- <packaging>jar</packaging>
- <name>Hello World SE</name>
-
- <profiles>
- <profile>
- <id>run</id>
- <activation>
- <property>
- <name>run</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <executions>
- <execution>
- <id>run</id>
- <phase>package</phase>
- <goals>
- <goal>java</goal>
- </goals>
- </execution>
- </executions>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <configuration>
- <mainClass>org.jboss.webbeans.environment.se.StartMain</mainClass>
- </configuration>
- </plugin>
- <plugin>
- <groupId>com.google.code.maven-license-plugin</groupId>
- <artifactId>maven-license-plugin</artifactId>
- <version>1.4.0</version>
- <configuration>
- <basedir>${basedir}</basedir>
- <header>${basedir}/src/etc/header.txt</header>
- <quiet>false</quiet>
- <failIfMissing>true</failIfMissing>
- <aggregate>false</aggregate>
- <encoding>UTF-8</encoding>
- </configuration>
- <executions>
- <execution>
- <phase>compile</phase>
- <goals>
- <goal>format</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <mainClass>org.jboss.webbeans.environment.se.StartMain</mainClass>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>webbeans-examples-parent</artifactId>
+ <groupId>org.jboss.webbeans.examples</groupId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.webbeans.examples.se</groupId>
+ <artifactId>webbeans-se-hello-world</artifactId>
+ <packaging>jar</packaging>
+ <name>Hello World SE</name>
- <dependencies>
- <dependency>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-se</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-core</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
+ <profiles>
+ <profile>
+ <id>run</id>
+ <activation>
+ <property>
+ <name>run</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <executions>
+ <execution>
+ <id>run</id>
+ <phase>package</phase>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ </execution>
+ </executions>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <configuration>
+ <mainClass>org.jboss.webbeans.environment.se.StartMain</mainClass>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>com.google.code.maven-license-plugin</groupId>
+ <artifactId>maven-license-plugin</artifactId>
+ <version>1.4.0</version>
+ <configuration>
+ <basedir>${basedir}</basedir>
+ <header>${basedir}/src/etc/header.txt</header>
+ <quiet>false</quiet>
+ <failIfMissing>true</failIfMissing>
+ <aggregate>false</aggregate>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>compile</phase>
+ <goals>
+ <goal>format</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <mainClass>org.jboss.webbeans.environment.se.StartMain</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.webbeans</groupId>
+ <artifactId>webbeans-se</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.webbeans</groupId>
+ <artifactId>webbeans-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
</project>
Modified: examples/trunk/se/hello-world/src/main/java/org/jboss/webbeans/environment/se/example/simple/CommandLineArgsValidator.java
===================================================================
--- examples/trunk/se/hello-world/src/main/java/org/jboss/webbeans/environment/se/example/simple/CommandLineArgsValidator.java 2009-09-22 15:27:41 UTC (rev 3738)
+++ examples/trunk/se/hello-world/src/main/java/org/jboss/webbeans/environment/se/example/simple/CommandLineArgsValidator.java 2009-09-22 15:30:12 UTC (rev 3739)
@@ -27,38 +27,40 @@
/**
* Validates command line arguments, producing errors where applicable.
+ *
* @author Peter Royle
*/
@ApplicationScoped
public class CommandLineArgsValidator
{
- @Inject @Parameters
- private List<String> validParams;
- private List<String> errors = new ArrayList<String>();
+ @Inject
+ @Parameters
+ private List<String> validParams;
+ private List<String> errors = new ArrayList<String>();
- @Inject
- public void checkParameters()
- {
- if (validParams.size() != 1)
- {
- errors.add( "Please supply just one parameter: your first name" );
- validParams = Collections.EMPTY_LIST;
- }
- }
+ @Inject
+ public void checkParameters()
+ {
+ if (validParams.size() != 1)
+ {
+ errors.add("Please supply just one parameter: your first name");
+ validParams = Collections.EMPTY_LIST;
+ }
+ }
- public boolean hasErrors()
- {
- return !this.errors.isEmpty();
- }
+ public boolean hasErrors()
+ {
+ return !this.errors.isEmpty();
+ }
- public List<String> getErrors()
- {
- return errors;
- }
+ public List<String> getErrors()
+ {
+ return errors;
+ }
- public List<String> getValidParameters()
- {
- return validParams;
- }
+ public List<String> getValidParameters()
+ {
+ return validParams;
+ }
}
Modified: examples/trunk/se/hello-world/src/main/java/org/jboss/webbeans/environment/se/example/simple/HelloWorld.java
===================================================================
--- examples/trunk/se/hello-world/src/main/java/org/jboss/webbeans/environment/se/example/simple/HelloWorld.java 2009-09-22 15:27:41 UTC (rev 3738)
+++ examples/trunk/se/hello-world/src/main/java/org/jboss/webbeans/environment/se/example/simple/HelloWorld.java 2009-09-22 15:30:12 UTC (rev 3739)
@@ -26,22 +26,23 @@
public class HelloWorld
{
- @Inject
- CommandLineArgsValidator argsVlidator;
+ @Inject
+ CommandLineArgsValidator argsVlidator;
- /**
- * Prints a hello message using the first name.
- * @param firstName The first name.
- */
- public void printHello( @Observes
- AfterDeploymentValidation after )
- {
- if (!argsVlidator.hasErrors())
- {
- System.out.println( "Hello " + argsVlidator.getValidParameters().get( 0 ) );
- } else
- {
- System.out.println( "Please provide just one argument: your first name" );
- }
- }
+ /**
+ * Prints a hello message using the first name.
+ *
+ * @param firstName The first name.
+ */
+ public void printHello(@Observes AfterDeploymentValidation after)
+ {
+ if (!argsVlidator.hasErrors())
+ {
+ System.out.println("Hello " + argsVlidator.getValidParameters().get(0));
+ }
+ else
+ {
+ System.out.println("Please provide just one argument: your first name");
+ }
+ }
}
Modified: examples/trunk/se/numberguess/pom.xml
===================================================================
--- examples/trunk/se/numberguess/pom.xml 2009-09-22 15:27:41 UTC (rev 3738)
+++ examples/trunk/se/numberguess/pom.xml 2009-09-22 15:30:12 UTC (rev 3739)
@@ -1,78 +1,79 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <artifactId>webbeans-examples-parent</artifactId>
- <groupId>org.jboss.webbeans.examples</groupId>
- <version>1.0.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.webbeans.examples.se</groupId>
- <artifactId>webbeans-se-numberguess</artifactId>
- <packaging>jar</packaging>
- <name>Number Guess SE</name>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <artifactId>webbeans-examples-parent</artifactId>
+ <groupId>org.jboss.webbeans.examples</groupId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.webbeans.examples.se</groupId>
+ <artifactId>webbeans-se-numberguess</artifactId>
+ <packaging>jar</packaging>
+ <name>Number Guess SE</name>
- <dependencies>
- <dependency>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-se</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.webbeans</groupId>
- <artifactId>webbeans-core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.annotation</groupId>
- <artifactId>jsr250-api</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <mainClass>org.jboss.webbeans.environment.se.StartMain</mainClass>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>run</id>
- <activation>
- <property>
- <name>run</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <executions>
- <execution>
- <id>run</id>
- <phase>package</phase>
- <goals>
- <goal>java</goal>
- </goals>
- </execution>
- </executions>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <configuration>
- <mainClass>org.jboss.webbeans.environment.se.StartMain</mainClass>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.webbeans</groupId>
+ <artifactId>webbeans-se</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.webbeans</groupId>
+ <artifactId>webbeans-core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <mainClass>org.jboss.webbeans.environment.se.StartMain</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>run</id>
+ <activation>
+ <property>
+ <name>run</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <executions>
+ <execution>
+ <id>run</id>
+ <phase>package</phase>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ </execution>
+ </executions>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <configuration>
+ <mainClass>org.jboss.webbeans.environment.se.StartMain</mainClass>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
Modified: examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Game.java
===================================================================
--- examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Game.java 2009-09-22 15:27:41 UTC (rev 3738)
+++ examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Game.java 2009-09-22 15:30:12 UTC (rev 3739)
@@ -23,121 +23,122 @@
import javax.inject.Inject;
/**
- * This class contains the pure logic of the Number Guess game.
- * On initialization a random number will be selected. Multiple "guesses"
- * as to what that number might be can be made using the 'check' method. The
- * user wins if they can guess the selected number in the alloted amount of
- * tries.
+ * This class contains the pure logic of the Number Guess game. On
+ * initialization a random number will be selected. Multiple "guesses" as to
+ * what that number might be can be made using the 'check' method. The user wins
+ * if they can guess the selected number in the alloted amount of tries.
*
* @author Peter Royle
*/
@ApplicationScoped
public class Game implements Serializable
{
- public static final int MAX_NUM_GUESSES = 10;
-
- private Integer number;
- private int guess = 0;
- private int smallest = 0;
-
- @Inject @MaxNumber
- private int maxNumber;
-
- private int biggest;
- private int remainingGuesses = MAX_NUM_GUESSES;
- private boolean validNumberRange = true;
+ public static final int MAX_NUM_GUESSES = 10;
- @Inject Generator rndGenerator;
+ private Integer number;
+ private int guess = 0;
+ private int smallest = 0;
- public Game()
- {
- }
+ @Inject
+ @MaxNumber
+ private int maxNumber;
- public int getNumber()
- {
- return number;
- }
+ private int biggest;
+ private int remainingGuesses = MAX_NUM_GUESSES;
+ private boolean validNumberRange = true;
- public int getGuess()
- {
- return guess;
- }
+ @Inject
+ Generator rndGenerator;
- public void setGuess( int guess )
- {
- this.guess = guess;
- }
+ public Game()
+ {
+ }
- public int getSmallest()
- {
- return smallest;
- }
+ public int getNumber()
+ {
+ return number;
+ }
- public int getBiggest()
- {
- return biggest;
- }
+ public int getGuess()
+ {
+ return guess;
+ }
- public int getRemainingGuesses()
- {
- return remainingGuesses;
- }
+ public void setGuess(int guess)
+ {
+ this.guess = guess;
+ }
- public boolean isValidNumberRange()
- {
- return validNumberRange;
- }
+ public int getSmallest()
+ {
+ return smallest;
+ }
- public boolean isGameWon()
- {
- return guess == number;
- }
+ public int getBiggest()
+ {
+ return biggest;
+ }
- public boolean isGameLost()
- {
- return guess != number && remainingGuesses <= 0;
- }
+ public int getRemainingGuesses()
+ {
+ return remainingGuesses;
+ }
- public boolean check()
- {
- boolean result = false;
+ public boolean isValidNumberRange()
+ {
+ return validNumberRange;
+ }
- if ( checkNewNumberRangeIsValid() )
- {
- if ( guess > number )
- {
- biggest = guess - 1;
- }
+ public boolean isGameWon()
+ {
+ return guess == number;
+ }
- if ( guess < number )
- {
- smallest = guess + 1;
- }
+ public boolean isGameLost()
+ {
+ return guess != number && remainingGuesses <= 0;
+ }
- if ( guess == number )
- {
- result = true;
- }
+ public boolean check()
+ {
+ boolean result = false;
- remainingGuesses--;
- }
+ if (checkNewNumberRangeIsValid())
+ {
+ if (guess > number)
+ {
+ biggest = guess - 1;
+ }
- return result;
- }
+ if (guess < number)
+ {
+ smallest = guess + 1;
+ }
- private boolean checkNewNumberRangeIsValid()
- {
- return validNumberRange = ( ( guess >= smallest ) && ( guess <= biggest ) );
- }
+ if (guess == number)
+ {
+ result = true;
+ }
- @PostConstruct
- public void reset()
- {
- this.smallest = 0;
- this.guess = 0;
- this.remainingGuesses = 10;
- this.biggest = maxNumber;
- this.number = rndGenerator.next();
- System.out.println( "psst! the number is " + this.number );
- }
+ remainingGuesses--;
+ }
+
+ return result;
+ }
+
+ private boolean checkNewNumberRangeIsValid()
+ {
+ return validNumberRange = ((guess >= smallest) && (guess <= biggest));
+ }
+
+ @PostConstruct
+ public void reset()
+ {
+ this.smallest = 0;
+ this.guess = 0;
+ this.remainingGuesses = 10;
+ this.biggest = maxNumber;
+ this.number = rndGenerator.next();
+ System.out.println("psst! the number is " + this.number);
+ }
}
Modified: examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Generator.java
===================================================================
--- examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Generator.java 2009-09-22 15:27:41 UTC (rev 3738)
+++ examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Generator.java 2009-09-22 15:30:12 UTC (rev 3739)
@@ -24,24 +24,26 @@
@ApplicationScoped
public class Generator implements Serializable
{
- private static final long serialVersionUID = -7213673465118041882L;
- private java.util.Random random = new java.util.Random( System.currentTimeMillis() );
- private int maxNumber = 100;
+ private static final long serialVersionUID = -7213673465118041882L;
+ private java.util.Random random = new java.util.Random(System.currentTimeMillis());
+ private int maxNumber = 100;
- java.util.Random getRandom()
- {
- return random;
- }
+ java.util.Random getRandom()
+ {
+ return random;
+ }
- @Produces @Random
- int next()
- {
- return getRandom().nextInt( maxNumber );
- }
+ @Produces
+ @Random
+ int next()
+ {
+ return getRandom().nextInt(maxNumber);
+ }
- @Produces @MaxNumber
- int getMaxNumber()
- {
- return maxNumber;
- }
+ @Produces
+ @MaxNumber
+ int getMaxNumber()
+ {
+ return maxNumber;
+ }
}
Modified: examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MaxNumber.java
===================================================================
--- examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MaxNumber.java 2009-09-22 15:27:41 UTC (rev 3738)
+++ examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MaxNumber.java 2009-09-22 15:30:12 UTC (rev 3739)
@@ -27,10 +27,9 @@
import java.lang.annotation.Target;
import javax.inject.Qualifier;
-@Target( {TYPE, METHOD, PARAMETER, FIELD} )
-@Retention( RUNTIME )
+
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
@Documented
@Qualifier
-public @interface MaxNumber
-{
-}
+public @interface MaxNumber {}
Modified: examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MessageGenerator.java
===================================================================
--- examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MessageGenerator.java 2009-09-22 15:27:41 UTC (rev 3738)
+++ examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/MessageGenerator.java 2009-09-22 15:30:12 UTC (rev 3739)
@@ -21,50 +21,57 @@
/**
* This class generates on demand appropriate messages depending on the current
* state of the injected instance of Game.
+ *
* @author Peter Royle
*/
public class MessageGenerator
{
- @Inject Game game;
+ @Inject
+ private Game game;
- public String getChallengeMessage()
- {
- StringBuilder chalengeMsg = new StringBuilder( "I'm thinking of a number between " );
- chalengeMsg.append( game.getSmallest() );
- chalengeMsg.append( " and " );
- chalengeMsg.append( game.getBiggest() );
- chalengeMsg.append( ". Can you guess what it is?" );
+ public String getChallengeMessage()
+ {
+ StringBuilder chalengeMsg = new StringBuilder("I'm thinking of a number between ");
+ chalengeMsg.append(game.getSmallest());
+ chalengeMsg.append(" and ");
+ chalengeMsg.append(game.getBiggest());
+ chalengeMsg.append(". Can you guess what it is?");
- return chalengeMsg.toString();
- }
+ return chalengeMsg.toString();
+ }
- public String getResultMessage()
- {
- if ( game.isGameWon() )
- {
- return "You guessed it! The number was " + game.getNumber();
- } else if ( game.isGameLost() )
- {
- return "You are fail! The number was " + game.getNumber();
- } else if ( ! game.isValidNumberRange() )
- {
- return "Invalid number range!";
- } else if ( game.getRemainingGuesses() == Game.MAX_NUM_GUESSES )
- {
- return "What is your first guess?";
- } else
- {
- String direction = null;
+ public String getResultMessage()
+ {
+ if (game.isGameWon())
+ {
+ return "You guessed it! The number was " + game.getNumber();
+ }
+ else if (game.isGameLost())
+ {
+ return "You are fail! The number was " + game.getNumber();
+ }
+ else if (!game.isValidNumberRange())
+ {
+ return "Invalid number range!";
+ }
+ else if (game.getRemainingGuesses() == Game.MAX_NUM_GUESSES)
+ {
+ return "What is your first guess?";
+ }
+ else
+ {
+ String direction = null;
- if ( game.getGuess() < game.getNumber() )
- {
- direction = "Higher";
- } else
- {
- direction = "Lower";
- }
+ if (game.getGuess() < game.getNumber())
+ {
+ direction = "Higher";
+ }
+ else
+ {
+ direction = "Lower";
+ }
- return direction + "! You have " + game.getRemainingGuesses() + " guesses left.";
- }
- }
+ return direction + "! You have " + game.getRemainingGuesses() + " guesses left.";
+ }
+ }
}
Modified: examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/NumberGuessFrame.java
===================================================================
--- examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/NumberGuessFrame.java 2009-09-22 15:27:41 UTC (rev 3738)
+++ examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/NumberGuessFrame.java 2009-09-22 15:30:12 UTC (rev 3739)
@@ -24,168 +24,176 @@
/**
* Swing-based number guess example, main application frame.
+ *
* @author Peter Royle
*/
public class NumberGuessFrame extends javax.swing.JFrame
{
- @Inject
- private Game game;
-
- @Inject
- private MessageGenerator msgGenerator;
+ @Inject
+ private Game game;
- public void start( @Observes AfterDeploymentValidation event )
- {
- java.awt.EventQueue.invokeLater( new Runnable()
- {
- public void run()
- {
- initComponents();
- setVisible( true );
- }
- } );
- }
+ @Inject
+ private MessageGenerator msgGenerator;
- /** This method is called to initialize the form.
- */
- @SuppressWarnings( "unchecked" )
- private void initComponents() {
+ public void start(@Observes AfterDeploymentValidation event)
+ {
+ java.awt.EventQueue.invokeLater(new Runnable()
+ {
+ public void run()
+ {
+ initComponents();
+ setVisible(true);
+ }
+ });
+ }
- borderPanel = new javax.swing.JPanel();
- gamePanel = new javax.swing.JPanel();
- inputsPanel = new javax.swing.JPanel();
- buttonPanel = new javax.swing.JPanel();
- guessButton = new javax.swing.JButton();
- replayBtn = new javax.swing.JButton();
- guessText = new javax.swing.JTextField();
- remainingGuessesPanel = new javax.swing.JPanel();
- guessremainLabel = new javax.swing.JLabel();
- guessesLeftBar = new javax.swing.JProgressBar();
- mainMsgPanel = new javax.swing.JPanel();
- mainLabel = new javax.swing.JLabel();
- messageLabel = new javax.swing.JLabel();
+ /**
+ * This method is called to initialize the form.
+ */
+ @SuppressWarnings("unchecked")
+ private void initComponents()
+ {
- setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
- getContentPane().setLayout(new java.awt.CardLayout());
+ borderPanel = new javax.swing.JPanel();
+ gamePanel = new javax.swing.JPanel();
+ inputsPanel = new javax.swing.JPanel();
+ buttonPanel = new javax.swing.JPanel();
+ guessButton = new javax.swing.JButton();
+ replayBtn = new javax.swing.JButton();
+ guessText = new javax.swing.JTextField();
+ remainingGuessesPanel = new javax.swing.JPanel();
+ guessremainLabel = new javax.swing.JLabel();
+ guessesLeftBar = new javax.swing.JProgressBar();
+ mainMsgPanel = new javax.swing.JPanel();
+ mainLabel = new javax.swing.JLabel();
+ messageLabel = new javax.swing.JLabel();
- borderPanel.setBorder(javax.swing.BorderFactory.createEmptyBorder(10, 10, 10, 10));
- borderPanel.setLayout(new java.awt.CardLayout());
+ setDefaultCloseOperation(javax.swing.WindowConstants.EXIT_ON_CLOSE);
+ getContentPane().setLayout(new java.awt.CardLayout());
- gamePanel.setLayout(new java.awt.BorderLayout(6, 6));
+ borderPanel.setBorder(javax.swing.BorderFactory.createEmptyBorder(10, 10, 10, 10));
+ borderPanel.setLayout(new java.awt.CardLayout());
- inputsPanel.setLayout(new java.awt.BorderLayout(8, 8));
+ gamePanel.setLayout(new java.awt.BorderLayout(6, 6));
- buttonPanel.setLayout(new java.awt.CardLayout());
+ inputsPanel.setLayout(new java.awt.BorderLayout(8, 8));
- guessButton.setText("Guess");
- guessButton.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- guessButtonActionPerformed(evt);
- }
- });
- buttonPanel.add(guessButton, "card2");
+ buttonPanel.setLayout(new java.awt.CardLayout());
- replayBtn.setText("Replay!");
- replayBtn.addActionListener(new java.awt.event.ActionListener() {
- public void actionPerformed(java.awt.event.ActionEvent evt) {
- replayBtnActionPerformed(evt);
- }
- });
- buttonPanel.add(replayBtn, "card3");
+ guessButton.setText("Guess");
+ guessButton.addActionListener(new java.awt.event.ActionListener()
+ {
+ public void actionPerformed(java.awt.event.ActionEvent evt)
+ {
+ guessButtonActionPerformed(evt);
+ }
+ });
+ buttonPanel.add(guessButton, "card2");
- inputsPanel.add(buttonPanel, java.awt.BorderLayout.LINE_END);
- inputsPanel.add(guessText, java.awt.BorderLayout.CENTER);
+ replayBtn.setText("Replay!");
+ replayBtn.addActionListener(new java.awt.event.ActionListener()
+ {
+ public void actionPerformed(java.awt.event.ActionEvent evt)
+ {
+ replayBtnActionPerformed(evt);
+ }
+ });
+ buttonPanel.add(replayBtn, "card3");
- gamePanel.add(inputsPanel, java.awt.BorderLayout.CENTER);
+ inputsPanel.add(buttonPanel, java.awt.BorderLayout.LINE_END);
+ inputsPanel.add(guessText, java.awt.BorderLayout.CENTER);
- remainingGuessesPanel.setLayout(new java.awt.BorderLayout(8, 8));
+ gamePanel.add(inputsPanel, java.awt.BorderLayout.CENTER);
- guessremainLabel.setText("Guesses remaining: ");
- remainingGuessesPanel.add(guessremainLabel, java.awt.BorderLayout.LINE_START);
+ remainingGuessesPanel.setLayout(new java.awt.BorderLayout(8, 8));
- guessesLeftBar.setMaximum(Game.MAX_NUM_GUESSES);
- guessesLeftBar.setValue(Game.MAX_NUM_GUESSES);
- guessesLeftBar.setPreferredSize(new java.awt.Dimension(10, 14));
- remainingGuessesPanel.add(guessesLeftBar, java.awt.BorderLayout.CENTER);
+ guessremainLabel.setText("Guesses remaining: ");
+ remainingGuessesPanel.add(guessremainLabel, java.awt.BorderLayout.LINE_START);
- gamePanel.add(remainingGuessesPanel, java.awt.BorderLayout.PAGE_END);
+ guessesLeftBar.setMaximum(Game.MAX_NUM_GUESSES);
+ guessesLeftBar.setValue(Game.MAX_NUM_GUESSES);
+ guessesLeftBar.setPreferredSize(new java.awt.Dimension(10, 14));
+ remainingGuessesPanel.add(guessesLeftBar, java.awt.BorderLayout.CENTER);
- mainMsgPanel.setLayout(new java.awt.GridLayout(2, 1, 6, 6));
+ gamePanel.add(remainingGuessesPanel, java.awt.BorderLayout.PAGE_END);
- mainLabel.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
- mainLabel.setText(msgGenerator.getChallengeMessage());
- mainMsgPanel.add(mainLabel);
+ mainMsgPanel.setLayout(new java.awt.GridLayout(2, 1, 6, 6));
- messageLabel.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
- messageLabel.setText(msgGenerator.getResultMessage());
- mainMsgPanel.add(messageLabel);
+ mainLabel.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
+ mainLabel.setText(msgGenerator.getChallengeMessage());
+ mainMsgPanel.add(mainLabel);
- gamePanel.add(mainMsgPanel, java.awt.BorderLayout.PAGE_START);
+ messageLabel.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
+ messageLabel.setText(msgGenerator.getResultMessage());
+ mainMsgPanel.add(messageLabel);
- borderPanel.add(gamePanel, "card2");
+ gamePanel.add(mainMsgPanel, java.awt.BorderLayout.PAGE_START);
- getContentPane().add(borderPanel, "card2");
+ borderPanel.add(gamePanel, "card2");
- pack();
- }
+ getContentPane().add(borderPanel, "card2");
- private void guessButtonActionPerformed( java.awt.event.ActionEvent evt )
- {
- int guess = -1;
+ pack();
+ }
- try
- {
- guess = Integer.parseInt(guessText.getText());
- } catch (NumberFormatException nfe)
- {
- //noop
- }
+ private void guessButtonActionPerformed(java.awt.event.ActionEvent evt)
+ {
+ int guess = -1;
- game.setGuess( guess );
- game.check();
- refreshUI();
+ try
+ {
+ guess = Integer.parseInt(guessText.getText());
+ }
+ catch (NumberFormatException nfe)
+ {
+ // noop
+ }
- if ( game.isGameWon() || game.isGameLost() )
- {
- switchButtons();
- }
- }
+ game.setGuess(guess);
+ game.check();
+ refreshUI();
- private void replayBtnActionPerformed( java.awt.event.ActionEvent evt )
- {
- game.reset();
- refreshUI();
- switchButtons();
- }
+ if (game.isGameWon() || game.isGameLost())
+ {
+ switchButtons();
+ }
+ }
- private void switchButtons()
- {
- CardLayout buttonLyt = (CardLayout) buttonPanel.getLayout();
- buttonLyt.next( buttonPanel );
- }
+ private void replayBtnActionPerformed(java.awt.event.ActionEvent evt)
+ {
+ game.reset();
+ refreshUI();
+ switchButtons();
+ }
- private void refreshUI()
- {
- mainLabel.setText( msgGenerator.getChallengeMessage() );
- messageLabel.setText( msgGenerator.getResultMessage() );
- guessText.setText( "" );
- guessesLeftBar.setValue( game.getRemainingGuesses() );
- guessText.requestFocus();
- }
+ private void switchButtons()
+ {
+ CardLayout buttonLyt = (CardLayout) buttonPanel.getLayout();
+ buttonLyt.next(buttonPanel);
+ }
- // swing components
- private javax.swing.JPanel borderPanel;
- private javax.swing.JPanel buttonPanel;
- private javax.swing.JPanel gamePanel;
- private javax.swing.JButton guessButton;
- private javax.swing.JTextField guessText;
- private javax.swing.JProgressBar guessesLeftBar;
- private javax.swing.JLabel guessremainLabel;
- private javax.swing.JPanel inputsPanel;
- private javax.swing.JLabel mainLabel;
- private javax.swing.JPanel mainMsgPanel;
- private javax.swing.JLabel messageLabel;
- private javax.swing.JPanel remainingGuessesPanel;
- private javax.swing.JButton replayBtn;
+ private void refreshUI()
+ {
+ mainLabel.setText(msgGenerator.getChallengeMessage());
+ messageLabel.setText(msgGenerator.getResultMessage());
+ guessText.setText("");
+ guessesLeftBar.setValue(game.getRemainingGuesses());
+ guessText.requestFocus();
+ }
+ // swing components
+ private javax.swing.JPanel borderPanel;
+ private javax.swing.JPanel buttonPanel;
+ private javax.swing.JPanel gamePanel;
+ private javax.swing.JButton guessButton;
+ private javax.swing.JTextField guessText;
+ private javax.swing.JProgressBar guessesLeftBar;
+ private javax.swing.JLabel guessremainLabel;
+ private javax.swing.JPanel inputsPanel;
+ private javax.swing.JLabel mainLabel;
+ private javax.swing.JPanel mainMsgPanel;
+ private javax.swing.JLabel messageLabel;
+ private javax.swing.JPanel remainingGuessesPanel;
+ private javax.swing.JButton replayBtn;
+
}
Modified: examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Random.java
===================================================================
--- examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Random.java 2009-09-22 15:27:41 UTC (rev 3738)
+++ examples/trunk/se/numberguess/src/main/java/org/jboss/webbeans/environment/se/example/numberguess/Random.java 2009-09-22 15:30:12 UTC (rev 3739)
@@ -27,10 +27,9 @@
import java.lang.annotation.Target;
import javax.inject.Qualifier;
-@Target( {TYPE, METHOD, PARAMETER, FIELD} )
-@Retention( RUNTIME )
+
+@Target( { TYPE, METHOD, PARAMETER, FIELD })
+@Retention(RUNTIME)
@Documented
@Qualifier
-public @interface Random
-{
-}
+public @interface Random {}
14 years, 7 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3738 - in examples/trunk/jsf/translator: ear and 2 other directories.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-09-22 11:27:41 -0400 (Tue, 22 Sep 2009)
New Revision: 3738
Added:
examples/trunk/jsf/translator/ear/
examples/trunk/jsf/translator/ejb/
examples/trunk/jsf/translator/war/
Removed:
examples/trunk/jsf/translator/webbeans-translator-ear/
examples/trunk/jsf/translator/webbeans-translator-ejb/
examples/trunk/jsf/translator/webbeans-translator-war/
Modified:
examples/trunk/jsf/translator/ear/pom.xml
examples/trunk/jsf/translator/ejb/pom.xml
examples/trunk/jsf/translator/pom.xml
examples/trunk/jsf/translator/war/pom.xml
Log:
fix structure and artifact/groupId
Copied: examples/trunk/jsf/translator/ear (from rev 3719, examples/trunk/jsf/translator/webbeans-translator-ear)
Modified: examples/trunk/jsf/translator/ear/pom.xml
===================================================================
--- examples/trunk/jsf/translator/webbeans-translator-ear/pom.xml 2009-09-22 11:00:43 UTC (rev 3719)
+++ examples/trunk/jsf/translator/ear/pom.xml 2009-09-22 15:27:41 UTC (rev 3738)
@@ -3,13 +3,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.jboss.webbeans.examples.translator</groupId>
- <artifactId>parent</artifactId>
+ <groupId>org.jboss.webbeans.examples.jsf.translator</groupId>
+ <artifactId>webbeans-jsf-translator-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.webbeans.examples</groupId>
- <artifactId>webbeans-translator-ear</artifactId>
+ <groupId>org.jboss.webbeans.examples.jsf.translator</groupId>
+ <artifactId>webbeans-jsf-translator-ear</artifactId>
<packaging>ear</packaging>
<name>Web Beans Examples: Translator (ear)</name>
Copied: examples/trunk/jsf/translator/ejb (from rev 3719, examples/trunk/jsf/translator/webbeans-translator-ejb)
Modified: examples/trunk/jsf/translator/ejb/pom.xml
===================================================================
--- examples/trunk/jsf/translator/webbeans-translator-ejb/pom.xml 2009-09-22 11:00:43 UTC (rev 3719)
+++ examples/trunk/jsf/translator/ejb/pom.xml 2009-09-22 15:27:41 UTC (rev 3738)
@@ -3,13 +3,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.jboss.webbeans.examples.translator</groupId>
- <artifactId>parent</artifactId>
+ <groupId>org.jboss.webbeans.examples.jsf.translator</groupId>
+ <artifactId>webbeans-jsf-translator-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.webbeans.examples.translator</groupId>
- <artifactId>webbeans-translator-ejb</artifactId>
+ <groupId>org.jboss.webbeans.examples.jsf.translator</groupId>
+ <artifactId>webbeans-jsf-translator-ejb</artifactId>
<packaging>ejb</packaging>
<name>Web Beans Examples: Translator (ejb)</name>
Modified: examples/trunk/jsf/translator/pom.xml
===================================================================
--- examples/trunk/jsf/translator/pom.xml 2009-09-22 15:20:16 UTC (rev 3737)
+++ examples/trunk/jsf/translator/pom.xml 2009-09-22 15:27:41 UTC (rev 3738)
@@ -6,8 +6,8 @@
<artifactId>webbeans-examples-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.webbeans.examples.translator</groupId>
- <artifactId>parent</artifactId>
+ <groupId>org.jboss.webbeans.examples.jsf.translator</groupId>
+ <artifactId>webbeans-jsf-translator-parent</artifactId>
<packaging>pom</packaging>
<name>Web Beans Examples: Translator (parent)</name>
@@ -16,9 +16,9 @@
</description>
<modules>
- <module>webbeans-translator-war</module>
- <module>webbeans-translator-ejb</module>
- <module>webbeans-translator-ear</module>
+ <module>war</module>
+ <module>ejb</module>
+ <module>ear</module>
</modules>
<dependencyManagement>
Copied: examples/trunk/jsf/translator/war (from rev 3719, examples/trunk/jsf/translator/webbeans-translator-war)
Modified: examples/trunk/jsf/translator/war/pom.xml
===================================================================
--- examples/trunk/jsf/translator/webbeans-translator-war/pom.xml 2009-09-22 11:00:43 UTC (rev 3719)
+++ examples/trunk/jsf/translator/war/pom.xml 2009-09-22 15:27:41 UTC (rev 3738)
@@ -3,13 +3,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.jboss.webbeans.examples.translator</groupId>
- <artifactId>parent</artifactId>
+ <groupId>org.jboss.webbeans.examples.jsf.translator</groupId>
+ <artifactId>webbeans-jsf-translator-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.webbeans.examples.translator</groupId>
- <artifactId>webbeans-translator-war</artifactId>
+ <groupId>org.jboss.webbeans.examples.jsf.translator</groupId>
+ <artifactId>webbeans-jsf-translator-war</artifactId>
<packaging>war</packaging>
<name>Web Beans Examples: Translator (war)</name>
14 years, 7 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3737 - examples/trunk/jsf/login.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-09-22 11:20:16 -0400 (Tue, 22 Sep 2009)
New Revision: 3737
Modified:
examples/trunk/jsf/login/pom.xml
Log:
update groupId and artifact id
Modified: examples/trunk/jsf/login/pom.xml
===================================================================
--- examples/trunk/jsf/login/pom.xml 2009-09-22 15:19:24 UTC (rev 3736)
+++ examples/trunk/jsf/login/pom.xml 2009-09-22 15:20:16 UTC (rev 3737)
@@ -8,8 +8,8 @@
<version>1.0.0-SNAPSHOT</version>
</parent>
- <groupId>org.jboss.webbeans.examples</groupId>
- <artifactId>webbeans-login</artifactId>
+ <groupId>org.jboss.webbeans.examples.jsf</groupId>
+ <artifactId>webbeans-jsf-login</artifactId>
<packaging>war</packaging>
<name>Web Beans Examples: Login</name>
14 years, 7 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3736 - examples/trunk/jsf/numberguess.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-09-22 11:19:24 -0400 (Tue, 22 Sep 2009)
New Revision: 3736
Added:
examples/trunk/jsf/numberguess/pom.xml
Log:
rename pom.xml
Added: examples/trunk/jsf/numberguess/pom.xml
===================================================================
--- examples/trunk/jsf/numberguess/pom.xml (rev 0)
+++ examples/trunk/jsf/numberguess/pom.xml 2009-09-22 15:19:24 UTC (rev 3736)
@@ -0,0 +1,86 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.jboss.webbeans.examples</groupId>
+ <artifactId>webbeans-examples-parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.jboss.webbeans.examples.jsf</groupId>
+ <artifactId>webbeans-jsf-numberguess</artifactId>
+ <packaging>war</packaging>
+ <name>Web Beans Examples: Numberguess for JBoss AS 5.x</name>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>codehaus snapshot repository</id>
+ <url>http://snapshots.repository.codehaus.org/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </pluginRepository>
+ </pluginRepositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>test</scope>
+ <classifier>jdk15</classifier>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.webbeans</groupId>
+ <artifactId>jsr299-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.facelets</groupId>
+ <artifactId>jsf-facelets</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <!-- <dependency>
+ <groupId>org.jboss.el</groupId>
+ <artifactId>jboss-el</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>-->
+
+ <dependency>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>el-impl</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>jsr250-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <finalName>webbeans-numberguess</finalName>
+ </build>
+
+</project>
+
14 years, 7 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r3735 - in examples/trunk/se: numberguess and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-09-22 11:18:11 -0400 (Tue, 22 Sep 2009)
New Revision: 3735
Modified:
examples/trunk/se/hello-world/pom.xml
examples/trunk/se/numberguess/pom.xml
Log:
new group id
Modified: examples/trunk/se/hello-world/pom.xml
===================================================================
--- examples/trunk/se/hello-world/pom.xml 2009-09-22 15:17:52 UTC (rev 3734)
+++ examples/trunk/se/hello-world/pom.xml 2009-09-22 15:18:11 UTC (rev 3735)
@@ -7,7 +7,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.webbeans.examples</groupId>
+ <groupId>org.jboss.webbeans.examples.se</groupId>
<artifactId>webbeans-se-hello-world</artifactId>
<packaging>jar</packaging>
<name>Hello World SE</name>
Modified: examples/trunk/se/numberguess/pom.xml
===================================================================
--- examples/trunk/se/numberguess/pom.xml 2009-09-22 15:17:52 UTC (rev 3734)
+++ examples/trunk/se/numberguess/pom.xml 2009-09-22 15:18:11 UTC (rev 3735)
@@ -7,7 +7,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.webbeans.examples</groupId>
+ <groupId>org.jboss.webbeans.examples.se</groupId>
<artifactId>webbeans-se-numberguess</artifactId>
<packaging>jar</packaging>
<name>Number Guess SE</name>
14 years, 7 months
- 1
- 0