Change log:

* Reworked the build system fixing SEAMWICKET-21 * Added seam seam-wicket-mock to support SEAMWICKET-22, which enables the SeamWicketTester for SeamApplication * Made a test case for NumberGuess example
seam · Jan 12, 2011 · 2dcc71b · 2dcc71b
1 parent 28d9530
commit 2dcc71b
Show file tree

Hide file tree

Showing 23 changed files with 1,286 additions and 460 deletions.
diff --git a/.externalToolBuilders/org.hibernate.eclipse.console.hibernateBuilder.launch b/.externalToolBuilders/org.hibernate.eclipse.console.hibernateBuilder.launch
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_DISABLED_BUILDER" value="org.hibernate.eclipse.console.hibernateBuilder"/>
+<mapAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+</launchConfiguration>
diff --git a/.externalToolBuilders/org.scala-ide.sdt.core.scalabuilder.launch b/.externalToolBuilders/org.scala-ide.sdt.core.scalabuilder.launch
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="false"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_DISABLED_BUILDER" value="org.scala-ide.sdt.core.scalabuilder"/>
+<mapAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+</launchConfiguration>
diff --git a/.scala_dependencies b/.scala_dependencies
@@ -0,0 +1,3 @@
+/Users/oranheim/Documents/workspace/wicket-git/target/classes:/Applications/eclipse/configuration/org.eclipse.osgi/bundles/789/1/.cp/lib/scala-library.jar:/Applications/eclipse/configuration/org.eclipse.osgi/bundles/789/1/.cp/lib/scala-dbc.jar:/Applications/eclipse/configuration/org.eclipse.osgi/bundles/789/1/.cp/lib/scala-swing.jar:/Users/oranheim/.m2/repository/org/slf4j/slf4j-api/1.5.10/slf4j-api-1.5.10.jar:/Users/oranheim/.m2/repository/javax/enterprise/cdi-api/1.0-SP3/cdi-api-1.0-SP3.jar:/Users/oranheim/.m2/repository/org/jboss/spec/javax/interceptor/jboss-interceptors-api_1.1_spec/1.0.0.Final/jboss-interceptors-api_1.1_spec-1.0.0.Final.jar:/Users/oranheim/.m2/repository/javax/inject/javax.inject/1/javax.inject-1.jar:/Users/oranheim/.m2/repository/org/apache/wicket/wicket/1.4.14/wicket-1.4.14.jar:/Users/oranheim/.m2/repository/org/jboss/seam/solder/seam-solder/3.0.0.Beta1/seam-solder-3.0.0.Beta1.jar:/Users/oranheim/.m2/repository/org/jboss/logging/jboss-logging/3.0.0.Beta4/jboss-logging-3.0.0.Beta4.jar:/Users/oranheim/.m2/repository/org/jboss/weld/weld-api/1.1.Beta2/weld-api-1.1.Beta2.jar:/Users/oranheim/.m2/repository/org/jboss/weld/weld-core/1.1.0.CR4/weld-core-1.1.0.CR4.jar:/Users/oranheim/.m2/repository/org/jboss/weld/weld-spi/1.1.Beta2/weld-spi-1.1.Beta2.jar:/Users/oranheim/.m2/repository/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar:/Users/oranheim/.m2/repository/org/javassist/javassist/3.13.0-GA/javassist-3.13.0-GA.jar:/Users/oranheim/.m2/repository/com/google/guava/guava/r06/guava-r06.jar:/Users/oranheim/.m2/repository/org/jboss/interceptor/jboss-interceptor-spi/2.0.0.CR1/jboss-interceptor-spi-2.0.0.CR1.jar:/Users/oranheim/.m2/repository/org/jboss/interceptor/jboss-interceptor-core/2.0.0.CR1/jboss-interceptor-core-2.0.0.CR1.jar:/Users/oranheim/.m2/repository/org/slf4j/slf4j-ext/1.5.10/slf4j-ext-1.5.10.jar:/Users/oranheim/.m2/repository/ch/qos/cal10n/cal10n-api/0.7.2/cal10n-api-0.7.2.jar:/Users/oranheim/.m2/repository/org/jboss/spec/javax/annotation/jboss-annotations-api_1.1_spec/1.0.0.Final/jboss-annotations-api_1.1_spec-1.0.0.Final.jar:/Users/oranheim/.m2/repository/org/jboss/spec/javax/resource/jboss-connector-api_1.5_spec/1.0.0.Final/jboss-connector-api_1.5_spec-1.0.0.Final.jar:/Users/oranheim/.m2/repository/org/jboss/spec/javax/ejb/jboss-ejb-api_3.1_spec/1.0.0.Final/jboss-ejb-api_3.1_spec-1.0.0.Final.jar:/Users/oranheim/.m2/repository/javax/xml/jaxrpc-api/1.1/jaxrpc-api-1.1.jar:/Users/oranheim/.m2/repository/org/jboss/spec/javax/el/jboss-el-api_2.2_spec/1.0.0.Final/jboss-el-api_2.2_spec-1.0.0.Final.jar:/Users/oranheim/.m2/repository/org/jboss/spec/javax/security/jacc/jboss-jacc-api_1.4_spec/1.0.0.Final/jboss-jacc-api_1.4_spec-1.0.0.Final.jar:/Users/oranheim/.m2/repository/org/jboss/spec/javax/enterprise/deploy/jboss-jad-api_1.2_spec/1.0.0.Final/jboss-jad-api_1.2_spec-1.0.0.Final.jar:/Users/oranheim/.m2/repository/org/jboss/spec/javax/security/auth/message/jboss-jaspi-api_1.0_spec/1.0.0.Final/jboss-jaspi-api_1.0_spec-1.0.0.Final.jar:/Users/oranheim/.m2/repository/org/jboss/spec/javax/xml/registry/jboss-jaxr-api_1.0_spec/1.0.0.Final/jboss-jaxr-api_1.0_spec-1.0.0.Final.jar:/Users/oranheim/.m2/repository/org/jboss/spec/javax/jms/jboss-jms-api_1.1_spec/1.0.0.Final/jboss-jms-api_1.1_spec-1.0.0.Final.jar:/Users/oranheim/.m2/repository/org/jboss/spec/javax/servlet/jsp/jboss-jsp-api_2.2_spec/1.0.0.Final/jboss-jsp-api_2.2_spec-1.0.0.Final.jar:/Users/oranheim/.m2/repository/org/jboss/spec/javax/servlet/jboss-servlet-api_3.0_spec/1.0.0.Final/jboss-servlet-api_3.0_spec-1.0.0.Final.jar:/Users/oranheim/.m2/repository/org/jboss/spec/javax/transaction/jboss-transaction-api_1.1_spec/1.0.0.Final/jboss-transaction-api_1.1_spec-1.0.0.Final.jar:/Users/oranheim/.m2/repository/org/jboss/spec/javax/xml/bind/jboss-jaxb-api_2.2_spec/1.0.0.Final/jboss-jaxb-api_2.2_spec-1.0.0.Final.jar:/Users/oranheim/.m2/repository/org/jboss/spec/javax/xml/rpc/jboss-jaxrpc-api_1.1_spec/1.0.0.Final/jboss-jaxrpc-api_1.1_spec-1.0.0.Final.jar:/Users/oranheim/.m2/repository/org/jboss/spec/javax/xml/soap/jboss-saaj-api_1.3_spec/1.0.0.Final/jboss-saaj-api_1.3_spec-1.0.0.Final.jar:/Users/oranheim/.m2/repository/org/jboss/spec/javax/xml/ws/jboss-jaxws-api_2.2_spec/1.0.0.Final/jboss-jaxws-api_2.2_spec-1.0.0.Final.jar:/Users/oranheim/.m2/repository/javax/activation/activation/1.1/activation-1.1.jar:/Users/oranheim/.m2/repository/javax/faces/jsf-api/2.0.2-FCS/jsf-api-2.0.2-FCS.jar:/Users/oranheim/.m2/repository/javax/jws/jsr181-api/1.0-MR1/jsr181-api-1.0-MR1.jar:/Users/oranheim/.m2/repository/javax/mail/mail/1.4.2/mail-1.4.2.jar:/Users/oranheim/.m2/repository/javax/servlet/jstl/1.2/jstl-1.2.jar:/Users/oranheim/.m2/repository/org/hibernate/javax/persistence/hibernate-jpa-2.0-api/1.0.0.Final/hibernate-jpa-2.0-api-1.0.0.Final.jar:/Users/oranheim/.m2/repository/org/jboss/resteasy/jaxrs-api/2.1.0.GA/jaxrs-api-2.1.0.GA.jar:/Users/oranheim/.m2/repository/stax/stax-api/1.0.1/stax-api-1.0.1.jar:/Users/oranheim/.m2/repository/javax/validation/validation-api/1.0.0.GA/validation-api-1.0.0.GA.jar:/Users/oranheim/.m2/repository/org/mortbay/jetty/jetty/6.1.26/jetty-6.1.26.jar:/Users/oranheim/.m2/repository/org/mortbay/jetty/jetty-util/6.1.26/jetty-util-6.1.26.jar:/Users/oranheim/.m2/repository/org/mortbay/jetty/servlet-api/2.5-20081211/servlet-api-2.5-20081211.jar:/Users/oranheim/.m2/repository/org/jboss/arquillian/arquillian-junit/1.0.0.Alpha4.SP5/arquillian-junit-1.0.0.Alpha4.SP5.jar:/Users/oranheim/.m2/repository/org/jboss/arquillian/arquillian-impl-base/1.0.0.Alpha4.SP5/arquillian-impl-base-1.0.0.Alpha4.SP5.jar:/Users/oranheim/.m2/repository/org/jboss/arquillian/arquillian-api/1.0.0.Alpha4.SP5/arquillian-api-1.0.0.Alpha4.SP5.jar:/Users/oranheim/.m2/repository/org/jboss/shrinkwrap/shrinkwrap-api/1.0.0-alpha-11/shrinkwrap-api-1.0.0-alpha-11.jar:/Users/oranheim/.m2/repository/org/jboss/arquillian/arquillian-spi/1.0.0.Alpha4.SP5/arquillian-spi-1.0.0.Alpha4.SP5.jar:/Users/oranheim/.m2/repository/org/jboss/shrinkwrap/shrinkwrap-impl-base/1.0.0-alpha-11/shrinkwrap-impl-base-1.0.0-alpha-11.jar:/Users/oranheim/.m2/repository/org/jboss/shrinkwrap/shrinkwrap-spi/1.0.0-alpha-11/shrinkwrap-spi-1.0.0-alpha-11.jar:/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Classes/classes.jar:/System/Library/Frameworks/JavaVM.framework/Frameworks/JavaRuntimeSupport.framework/Resources/Java/JavaRuntimeSupport.jar:/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Classes/ui.jar:/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Classes/jsse.jar:/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Classes/jce.jar:/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Classes/charsets.jar:/Library/Java/Extensions/jnipcsc5.jar:/System/Library/Java/Extensions/AppleScriptEngine.jar:/System/Library/Java/Extensions/dns_sd.jar:/System/Library/Java/Extensions/j3daudio.jar:/System/Library/Java/Extensions/j3dcore.jar:/System/Library/Java/Extensions/j3dutils.jar:/System/Library/Java/Extensions/jai_codec.jar:/System/Library/Java/Extensions/jai_core.jar:/System/Library/Java/Extensions/mlibwrapper_jai.jar:/System/Library/Java/Extensions/MRJToolkit.jar:/System/Library/Java/Extensions/QTJava.zip:/System/Library/Java/Extensions/vecmath.jar:/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/lib/ext/apple_provider.jar:/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/lib/ext/dnsns.jar:/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/lib/ext/localedata.jar:/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/lib/ext/sunjce_provider.jar:/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/lib/ext/sunpkcs11.jar
+-------
+-------
diff --git a/api/pom.xml b/api/pom.xml
@@ -1,97 +1,107 @@
-<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>
+<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.seam.wicket</groupId>
+		<artifactId>seam-wicket-parent</artifactId>
+		<version>3.0.0-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+	<artifactId>seam-wicket-api</artifactId>
+	<version>3.0.0-SNAPSHOT</version>
+	<packaging>jar</packaging>
+	<name>Seam Wicket Module API</name>
 
-   <parent>
-      <groupId>org.jboss.seam.wicket</groupId>
-      <artifactId>seam-wicket-parent</artifactId>
-      <version>3.0.0-SNAPSHOT</version>
-      <relativePath>../pom.xml</relativePath>
-   </parent>
+	<url>${project.parent.url}</url>
 
-   <artifactId>seam-wicket-api</artifactId>
-   <packaging>jar</packaging>
+	<dependencies>
+		<dependency>
+			<groupId>org.jboss.seam.solder</groupId>
+			<artifactId>seam-solder-api</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.jboss.spec</groupId>
+			<artifactId>jboss-javaee-6.0</artifactId>
+			<type>pom</type>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.jboss.spec.javax.servlet</groupId>
+			<artifactId>jboss-servlet-api_3.0_spec</artifactId>
+			<scope>provided</scope>
+		</dependency>
 
-   <name>Seam Wicket Module API</name>
-   <!-- url required for JAR Manifest -->
-   <url>${project.parent.url}</url>
+		<dependency>
+			<groupId>org.apache.wicket</groupId>
+			<artifactId>wicket</artifactId>			
+		</dependency>
 
-   <dependencies>
-      <dependency>
-         <groupId>org.apache.wicket</groupId>
-         <artifactId>wicket</artifactId>
-      </dependency>
+		<dependency>
+			<groupId>javax.enterprise</groupId>
+			<artifactId>cdi-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
 
-      <dependency>
-         <groupId>javax.enterprise</groupId>
-         <artifactId>cdi-api</artifactId>
-         <scope>provided</scope>
-      </dependency>
+		<dependency>
+			<groupId>org.jboss.weld</groupId>
+			<artifactId>weld-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
 
-      <dependency>
-         <groupId>org.jboss.weld</groupId>
-         <artifactId>weld-api</artifactId>
-         <scope>provided</scope>
-      </dependency>
+		<dependency>
+			<groupId>org.jboss.weld</groupId>
+			<artifactId>weld-core</artifactId>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
 
-      <dependency>
-         <groupId>org.jboss.weld</groupId>
-         <artifactId>weld-core</artifactId>
-         <scope>provided</scope>
-      </dependency>
+	<build>
+		<plugins>
+         	<!-- No tests in the api, skip phase -->
+         	<!-- oranheim: not to be picky, but why is the above statement here? 
+         		 It's stated below: skip=true, so I would expect it to be skipped!? 
+         		 we should delete this comment. Btw, why don't we have tests?
+         	-->
+			<plugin>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<skipTests>true</skipTests>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 
-      <dependency>
-         <groupId>org.jboss.seam.solder</groupId>
-         <artifactId>seam-solder-api</artifactId>
-      </dependency>
-
-      <dependency>
-        <groupId>org.jboss.spec.javax.servlet</groupId>
-        <artifactId>jboss-servlet-api_3.0_spec</artifactId>
-        <scope>provided</scope>
-      </dependency>
-
-   </dependencies>
-
-   <build>
-      <plugins>
-         <!-- No tests in the api, skip phase -->
-         <plugin>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-               <skipTests>true</skipTests>
-            </configuration>
-         </plugin>
-      </plugins>
-   </build>
-
-   <profiles>
-      <profile>
-         <id>distribution</id>
-         <activation>
-            <property>
-               <name>release</name>
-            </property>
-         </activation>
-         <build>
-            <plugins>
-               <plugin>
-                  <groupId>org.apache.maven.plugins</groupId>
-                  <artifactId>maven-javadoc-plugin</artifactId>
-                  <executions>
-                     <execution>
-                        <id>attach-javadocs</id>
-                        <goals>
-                           <goal>jar</goal>
-                        </goals>
-                        <configuration>
-                           <detectOfflineLinks>false</detectOfflineLinks>
-                        </configuration>
-                     </execution>
-                  </executions>
-               </plugin>
-            </plugins>
-         </build>
-      </profile>
-   </profiles>
+	<profiles>
+		<profile>
+			<id>distribution</id>
+			<activation>
+				<property>
+					<name>release</name>
+				</property>
+			</activation>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-javadoc-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>attach-javadocs</id>
+								<goals>
+									<goal>jar</goal>
+								</goals>
+								<configuration>
+									<detectOfflineLinks>false</detectOfflineLinks>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 
 </project>
diff --git a/api/src/main/java/org/jboss/seam/wicket/util/NonContextual.java b/api/src/main/java/org/jboss/seam/wicket/util/NonContextual.java
@@ -56,11 +56,13 @@ public NonContextual(BeanManager manager, Class<? extends T> clazz)
       this.injectionTarget = manager.createInjectionTarget(type);
    }
 
+   @SuppressWarnings("unchecked")
    public Instance<T> newInstance()
    {
       return new Instance<T>(beanManager, (InjectionTarget<T>) injectionTarget);
    }
 
+   @SuppressWarnings("unchecked")
    public Instance<T> existingInstance(T instance)
    {
       return new Instance<T>(beanManager, (InjectionTarget<T>) injectionTarget, instance);