October 2012 - seam-commits - Jboss List Archives

Seam SVN: r15290 - branches/enterprise/WFK-2_1/distribution/src/main/assembly.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2012-10-12 14:31:39 -0400 (Fri, 12 Oct 2012) New Revision: 15290 Modified: branches/enterprise/WFK-2_1/distribution/src/main/assembly/dist.xml branches/enterprise/WFK-2_1/distribution/src/main/assembly/src.xml Log: customized more demo and src assembly Modified: branches/enterprise/WFK-2_1/distribution/src/main/assembly/dist.xml =================================================================== --- branches/enterprise/WFK-2_1/distribution/src/main/assembly/dist.xml 2012-10-12 18:09:04 UTC (rev 15289) +++ branches/enterprise/WFK-2_1/distribution/src/main/assembly/dist.xml 2012-10-12 18:31:39 UTC (rev 15290) @@ -11,22 +11,7 @@ <includeBaseDirectory>true</includeBaseDirectory>  - <fileSets> -  - <fileSet> - <directory>../examples</directory> - <outputDirectory>./examples</outputDirectory> - <useDefaultExcludes>true</useDefaultExcludes> - <excludes> - <exclude>**/*.log</exclude> - <exclude>**/${project.build.directory}/**</exclude> - <exclude>**/jar-dependencies/**</exclude> - <exclude>**/.settings/**</exclude> - <exclude>**/.project</exclude> - <exclude>**/.classpath</exclude> - </excludes> - </fileSet> - + <fileSets>  <fileSet> <directory>src/main/assembly</directory> Modified: branches/enterprise/WFK-2_1/distribution/src/main/assembly/src.xml =================================================================== --- branches/enterprise/WFK-2_1/distribution/src/main/assembly/src.xml 2012-10-12 18:09:04 UTC (rev 15289) +++ branches/enterprise/WFK-2_1/distribution/src/main/assembly/src.xml 2012-10-12 18:31:39 UTC (rev 15290) @@ -28,6 +28,7 @@ <exclude>.gitignore</exclude> <exclude>release-process.txt</exclude> <exclude>seam-reference-guide/</exclude> + <exclude>examples/</exclude> </excludes> </fileSet>

10 years, 8 months

1
0
0 / 0

Seam SVN: r15289 - in branches/enterprise/WFK-2_1/jboss-seam-gen/dist: ide-project-files/eclipse and 1 other directory.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2012-10-12 14:09:04 -0400 (Fri, 12 Oct 2012) New Revision: 15289 Removed: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/ide-project-files/eclipse/debug-glassfish.launch Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build.xml Log: removed unsupported things like glassfish and icefaces Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build.xml =================================================================== --- branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build.xml 2012-10-12 18:08:56 UTC (rev 15288) +++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/build.xml 2012-10-12 18:09:04 UTC (rev 15289) @@ -30,10 +30,6 @@ <condition property="jboss.home" value="${env.JBOSS_HOME}" else="C:/Program Files/jboss-as-7.1.1.Final"> <isset property="env.JBOSS_HOME"/> </condition> - <condition property="glassfish.home" value="${env.GLASSFISH_HOME}" else="C:/Program Files/glassfish-v2.1"> - <isset property="env.GLASSFISH_HOME"/> - </condition> - <property name="glassfish.domain" value="domain1"/> <condition property="workspace.home" value="C:/Projects" else="${user.home}/projects"> <os family="windows"/> </condition> @@ -180,9 +176,6 @@ <filter token="testPackage" value="${test.package}"/> <filter token="deploymentType" value="${project.type}"/> <filter token="jbossHome" value="${jboss.home}"/> - <filter token="glassfishHome" value="${glassfish.home}"/> - <filter token="glassfishDomain" value="${glassfish.domain}"/> - <filter token="iceHome" value="${icefaces.home}"/> <filter token="hbm2ddl" value="${hibernate.hbm2ddl.auto}"/> <filter token="driverJar" value="${driver.file}"/> <filter token="skin" value="${richfaces.skin}"/> @@ -233,17 +226,6 @@ defaultvalue="${old.jboss.home}"/> <pathFixer property="jboss.home.new"/> - <property name="old.glassfish.home" value="${glassfish.home}"/> - <input addproperty="glassfish.home.new" - message="Enter your GlassFish V2 or V3 home directory (Ignore if you aren't deploying to GlassFish) [${old.glassfish.home}]" - defaultvalue="${old.glassfish.home}"/> - <pathFixer property="glassfish.home.new"/> - - <property name="old.glassfish.domain" value="${glassfish.domain}"/> - <input addproperty="glassfish.domain.new" - message="Enter your GlassFish domain (Ignore if you aren't deploying to GlassFish) [${old.glassfish.domain}]" - defaultvalue="${old.glassfish.domain}"/> - <property name="old.project.name" value="myproject"/> <input addproperty="project.name.new" message="Enter the project name [${old.project.name}]" @@ -251,21 +233,6 @@ <normalizeProjectName property="project.name.new"/> <echo message="Accepted project name as: ${project.name.new}"/> - <condition property="richfaces.skin.new" value=""> <equals arg1="${icefaces.new}" arg2="y"/> </condition> @@ -568,8 +535,6 @@ <entry key="richfaces.skin" value="${richfaces.skin.new}"/> <entry key="project.type" value="${project.type.new}"/> <entry key="jboss.home" value="${jboss.home.new}"/> - <entry key="glassfish.home" value="${glassfish.home.new}"/> - <entry key="glassfish.domain" value="${glassfish.domain.new}"/> <entry key="icefaces" value="${icefaces.new}"/> <entry key="icefaces.home" value="${icefaces.home.new}"/> <entry key="action.package" value="${action.package.new}"/> @@ -836,7 +801,6 @@ <echo message="Copying build scripts for WAR deployment to the ${project.home} directory..."/> <copy todir="${project.home}"> <fileset dir="${templates.dir}/build-scripts"> - <include name="glassfish-build.xml"/> <include name="build-war.xml"/> </fileset> <filterset refid="project"/> @@ -879,7 +843,6 @@ <copy todir="${project.home}"> <fileset dir="${templates.dir}/build-scripts"> <include name="build.xml"/> - <include name="glassfish-build.xml"/> </fileset> <filterset refid="project"/> <filterset refid="jdbc"/> @@ -926,7 +889,6 @@ <copy todir="${project.home}/resources"> <fileset dir="${templates.dir}/resources/"> <exclude name="datasource-ds.xml"/> - <exclude name="glassfish-resources.xml"/> <exclude name="import.sql"/> <exclude name="components-*.properties"/> <exclude name="WEB-INF/components*.xml"/> @@ -1005,11 +967,6 @@ <filterset refid="project"/> </copy> - <copy tofile="${project.home}/debug-glassfish-${project.name}.launch" - file="${templates.dir}/ide-project-files/eclipse/debug-glassfish.launch"> - <filterset refid="project"/> - </copy> - <copy tofile="${project.home}/${project.name}.launch" file="${templates.dir}/hibernatetools/hibernate-console.launch"> <filterset refid="project"/> @@ -1070,18 +1027,6 @@ <replacevalue><![CDATA[<use-java-context>false</use-java-context>]]></replacevalue> </replace> - <copy tofile="${project.home}/resources/glassfish-resources-dev.xml" - file="${templates.dir}/resources/glassfish-resources.xml"> - <filterset refid="project"/> - <filterset refid="jdbc"/> - </copy> - - <copy tofile="${project.home}/resources/glassfish-resources-prod.xml" - file="${templates.dir}/resources/glassfish-resources.xml"> - <filterset refid="project"/> - <filterset refid="jdbc"/> - </copy> - <copy tofile="${project.home}/resources/import-dev.sql" file="${templates.dir}/resources/import.sql"> <filterset refid="project"/> @@ -1142,8 +1087,6 @@ <filterset refid="project"/> </copy> - <copy todir="${project.home}" file="${templates.dir}/build-scripts/glassfish-readme.txt"/> - <mkdir dir="${project.home}/src/${model.dir}"/> <mkdir dir="${project.home}/src/${action.dir}"/> <mkdir dir="${project.home}/src/${test.dir}"/> @@ -1741,7 +1684,6 @@ <target name="settings" depends="validate-project" description="Print the settings"> <echo message="JBoss AS home: ${jboss.home}"/> - <echo message="GlassFish home: ${glassfish.home}"/> <echo message="Project name: ${project.name}"/> <echo message="Project location: ${workspace.home}/${project.name}"/> <echo message="Project type: ${project.type}"/> Deleted: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/ide-project-files/eclipse/debug-glassfish.launch =================================================================== --- branches/enterprise/WFK-2_1/jboss-seam-gen/dist/ide-project-files/eclipse/debug-glassfish.launch 2012-10-12 18:08:56 UTC (rev 15288) +++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/ide-project-files/eclipse/debug-glassfish.launch 2012-10-12 18:09:04 UTC (rev 15289) @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<launchConfiguration type="org.eclipse.jdt.launching.remoteJavaApplication"> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> -<listEntry value="/@projectName@"/> -</listAttribute> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> -<listEntry value="4"/> -</listAttribute> -<listAttribute key="org.eclipse.debug.ui.favoriteGroups"> -<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/> -</listAttribute> -<booleanAttribute key="org.eclipse.jdt.launching.ALLOW_TERMINATE" value="true"/> -<mapAttribute key="org.eclipse.jdt.launching.CONNECT_MAP"> -<mapEntry key="port" value="9009"/> -<mapEntry key="hostname" value="localhost"/> -</mapAttribute> -<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="@projectName@"/> -<stringAttribute key="org.eclipse.jdt.launching.VM_CONNECTOR_ID" value="org.eclipse.jdt.launching.socketAttachConnector"/> -</launchConfiguration>

10 years, 8 months

1
0
0 / 0

Seam SVN: r15288 - branches/enterprise/WFK-2_1/build.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2012-10-12 14:08:56 -0400 (Fri, 12 Oct 2012) New Revision: 15288 Modified: branches/enterprise/WFK-2_1/build/common.build.xml Log: fixed missing quote Modified: branches/enterprise/WFK-2_1/build/common.build.xml =================================================================== --- branches/enterprise/WFK-2_1/build/common.build.xml 2012-10-12 18:08:48 UTC (rev 15287) +++ branches/enterprise/WFK-2_1/build/common.build.xml 2012-10-12 18:08:56 UTC (rev 15288) @@ -47,7 +47,7 @@  <property file="${seam.dir}/build.properties" /> - <property name="complete.version" value="2.3.0.Final-redhat-1 /> + <property name="complete.version" value="2.3.0.Final-redhat-1" /> <condition property="mavenized.property"> <not>

10 years, 8 months

1
0
0 / 0

Seam SVN: r15287 - in branches/enterprise/WFK-2_1: jboss-seam-ioc and 1 other directory.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2012-10-12 14:08:48 -0400 (Fri, 12 Oct 2012) New Revision: 15287 Modified: branches/enterprise/WFK-2_1/bom/pom.xml branches/enterprise/WFK-2_1/jboss-seam-ioc/pom.xml Log: removed guice dependency and tuned httpcomponents dependencies Modified: branches/enterprise/WFK-2_1/bom/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/bom/pom.xml 2012-10-12 14:35:50 UTC (rev 15286) +++ branches/enterprise/WFK-2_1/bom/pom.xml 2012-10-12 18:08:48 UTC (rev 15287) @@ -173,18 +173,6 @@ </dependency> <dependency> - <groupId>org.jbpm.jbpm3</groupId> - <artifactId>jbpm-jpdl</artifactId> - <version>3.2.10.SP3_seam2</version> - <exclusions> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> <groupId>net.sf.ehcache</groupId> <artifactId>ehcache</artifactId> <version>1.2.3</version> @@ -571,76 +559,71 @@ <version>1.6.5</version> </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-beans</artifactId> - <version>${version.spring}</version> - </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + <version>${version.spring}</version> + </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-aop</artifactId> - <version>${version.spring}</version> - </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + <version>${version.spring}</version> + </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-core</artifactId> - <version>${version.spring}</version> - </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-core</artifactId> + <version>${version.spring}</version> + </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context</artifactId> - <version>${version.spring}</version> - </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + <version>${version.spring}</version> + </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-context-support</artifactId> - <version>${version.spring}</version> - </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-context-support</artifactId> + <version>${version.spring}</version> + </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-tx</artifactId> - <version>${version.spring}</version> - </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-tx</artifactId> + <version>${version.spring}</version> + </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-jdbc</artifactId> - <version>${version.spring}</version> - </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-jdbc</artifactId> + <version>${version.spring}</version> + </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-orm</artifactId> - <version>${version.spring}</version> - </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-orm</artifactId> + <version>${version.spring}</version> + </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-jms</artifactId> - <version>${version.spring}</version> - </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-jms</artifactId> + <version>${version.spring}</version> + </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-web</artifactId> - <version>${version.spring}</version> - </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-web</artifactId> + <version>${version.spring}</version> + </dependency> - <dependency> - <groupId>org.springframework</groupId> - <artifactId>spring-webmvc</artifactId> - <version>${version.spring}</version> - </dependency> - <dependency> - <groupId>com.google.code.guice</groupId> - <artifactId>guice</artifactId> - <version>1.0</version> - </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-webmvc</artifactId> + <version>${version.spring}</version> + </dependency> <dependency> <groupId>cglib</groupId> @@ -649,30 +632,6 @@ </dependency> <dependency> - <groupId>com.adobe.blazeds</groupId> - <artifactId>blazeds-common</artifactId> - <version>3.2.0.3978</version> - </dependency> - - <dependency> - <groupId>com.adobe.blazeds</groupId> - <artifactId>blazeds-proxy</artifactId> - <version>3.2.0.3978</version> - </dependency> - - <dependency> - <groupId>com.adobe.blazeds</groupId> - <artifactId>blazeds-core</artifactId> - <version>3.2.0.3978</version> - </dependency> - - <dependency> - <groupId>com.adobe.blazeds</groupId> - <artifactId>blazeds-remoting</artifactId> - <version>3.2.0.3978</version> - </dependency> - - <dependency> <groupId>com.lowagie</groupId> <artifactId>itext</artifactId> <version>2.1.7</version> @@ -725,13 +684,13 @@ </exclusion> </exclusions> </dependency> -  - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - <version>4.0.2</version> - </dependency> +  <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>4.1.3</version> + </dependency> + <dependency> <groupId>org.openid4java</groupId> <artifactId>openid4java-consumer</artifactId> <version>0.9.6</version> Modified: branches/enterprise/WFK-2_1/jboss-seam-ioc/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/jboss-seam-ioc/pom.xml 2012-10-12 14:35:50 UTC (rev 15286) +++ branches/enterprise/WFK-2_1/jboss-seam-ioc/pom.xml 2012-10-12 18:08:48 UTC (rev 15287) @@ -55,12 +55,6 @@ </dependency> <dependency> - <groupId>com.google.code.guice</groupId> - <artifactId>guice</artifactId> - <optional>true</optional> - </dependency> - - <dependency> <groupId>org.hibernate.javax.persistence</groupId> <artifactId>hibernate-jpa-2.0-api</artifactId> <optional>true</optional> @@ -79,11 +73,6 @@ <scope>provided</scope> </dependency> - - - - - </dependencies> <profiles>

10 years, 8 months

1
0
0 / 0

Seam SVN: r15286 - branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2012-10-12 10:35:50 -0400 (Fri, 12 Oct 2012) New Revision: 15286 Modified: branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Deployments.java Log: removed hibernate.cfg.xml from integration testsuite Deployments.java Modified: branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Deployments.java =================================================================== --- branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Deployments.java 2012-10-11 14:51:09 UTC (rev 15285) +++ branches/enterprise/WFK-2_1/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Deployments.java 2012-10-12 14:35:50 UTC (rev 15286) @@ -31,7 +31,7 @@ .addAsResource("messages_en.properties") .addAsResource("META-INF/persistence.xml") - .addAsResource("hibernate.cfg.xml") + //.addAsResource("hibernate.cfg.xml") .addAsWebInfResource("WEB-INF/components.xml", "components.xml") .addAsWebInfResource("WEB-INF/pages.xml", "pages.xml") .addAsWebInfResource("WEB-INF/real-web.xml", "web.xml") @@ -39,37 +39,6 @@ .addAsWebInfResource("WEB-INF/jboss-seam-integration-tests-hornetq-jms.xml", "jboss-seam-integration-tests-hornetq-jms.xml"); } - public static WebArchive jbpmSeamDeployment() { - return ShrinkWrap.create(ZipImporter.class, "test.war").importFrom(new File("target/seam-integration-tests.war")).as(WebArchive.class) - .addAsWebInfResource(new StringAsset( - "<jboss-deployment-structure>" + - "<deployment>" + - "<dependencies>" + - "<module name=\"org.javassist\"/>" + - "<module name=\"org.dom4j\"/>" + - "<module name=\"org.apache.commons.collections\"/>" + - "</dependencies>" + - "</deployment>" + - "</jboss-deployment-structure>"), "jboss-deployment-structure.xml") - .addAsResource("seam.properties") - .addAsResource("components.properties") - .addAsResource("messages_en.properties") - .addAsResource("META-INF/persistence.xml") - - .addAsResource("testProcess1.jpdl.xml") - .addAsResource("testProcess2.jpdl.xml") - .addAsResource("testProcess3.jpdl.xml") - .addAsResource("testProcess4.jpdl.xml") - - .addAsResource("jbpm.cfg.xml") - - .addAsResource("hibernate.cfg.xml") - .addAsWebInfResource("WEB-INF/components-jbpm.xml", "components.xml") - .addAsWebInfResource("WEB-INF/pages.xml", "pages.xml") - .addAsWebInfResource("WEB-INF/web.xml", "web.xml") - .addAsWebInfResource("WEB-INF/ejb-jar.xml", "ejb-jar.xml"); - } - public static WebArchive defaultSeamDeployment(String customComponentsXml) { WebArchive war = ShrinkWrap.create(ZipImporter.class, "test.war").importFrom(new File("target/seam-integration-tests.war")).as(WebArchive.class) .addAsWebInfResource(new StringAsset( @@ -86,7 +55,7 @@ .addAsResource("messages_en.properties") .addAsResource("META-INF/persistence.xml") - .addAsResource("hibernate.cfg.xml") + //.addAsResource("hibernate.cfg.xml") .addAsWebInfResource(customComponentsXml, "components.xml") .addAsWebInfResource("WEB-INF/pages.xml", "pages.xml") .addAsWebInfResource("WEB-INF/web.xml", "web.xml")

10 years, 8 months

1
0
0 / 0

Seam SVN: r15285 - branches/enterprise/WFK-2_1/bom.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2012-10-11 10:51:09 -0400 (Thu, 11 Oct 2012) New Revision: 15285 Modified: branches/enterprise/WFK-2_1/bom/pom.xml Log: selenium version upgrade to 2.25.0 Modified: branches/enterprise/WFK-2_1/bom/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/bom/pom.xml 2012-10-11 14:51:01 UTC (rev 15284) +++ branches/enterprise/WFK-2_1/bom/pom.xml 2012-10-11 14:51:09 UTC (rev 15285) @@ -835,13 +835,13 @@ <dependency> <groupId>org.seleniumhq.selenium</groupId> <artifactId>selenium-server</artifactId> - <version>2.21.0</version> + <version>2.25.0</version> </dependency> <dependency> <groupId>org.seleniumhq.selenium</groupId> <artifactId>selenium-java</artifactId> - <version>2.21.0</version> + <version>2.25.0</version> </dependency> <dependency>

10 years, 8 months

1
0
0 / 0

Seam SVN: r15284 - in branches/enterprise/WFK-2_1/examples/booking: booking-web and 1 other directories.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2012-10-11 10:51:01 -0400 (Thu, 11 Oct 2012) New Revision: 15284 Modified: branches/enterprise/WFK-2_1/examples/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/LoginTest.java branches/enterprise/WFK-2_1/examples/booking/booking-web/pom.xml branches/enterprise/WFK-2_1/examples/booking/booking-web/src/main/webapp/exp/bookingExp.html branches/enterprise/WFK-2_1/examples/booking/booking-web/src/main/webapp/exp/confirmExp.html branches/enterprise/WFK-2_1/examples/booking/booking-web/src/main/webapp/exp/introExp.html branches/enterprise/WFK-2_1/examples/booking/booking-web/src/main/webapp/exp/loginExp.html branches/enterprise/WFK-2_1/examples/booking/booking-web/src/main/webapp/exp/mainExp.html branches/enterprise/WFK-2_1/examples/booking/booking-web/src/main/webapp/exp/registerExp.html branches/enterprise/WFK-2_1/examples/booking/booking-web/src/main/webapp/exp/workspaceExp.html Log: booking example cleanup Modified: branches/enterprise/WFK-2_1/examples/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/LoginTest.java =================================================================== --- branches/enterprise/WFK-2_1/examples/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/LoginTest.java 2012-10-11 14:50:43 UTC (rev 15283) +++ branches/enterprise/WFK-2_1/examples/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/LoginTest.java 2012-10-11 14:51:01 UTC (rev 15284) @@ -8,7 +8,6 @@ import org.jboss.arquillian.container.test.api.OverProtocol; import org.jboss.arquillian.junit.Arquillian; import org.jboss.seam.Component; -import org.jboss.seam.annotations.In; import org.jboss.seam.contexts.Lifecycle; import org.jboss.seam.core.Manager; import org.jboss.seam.example.booking.User; Modified: branches/enterprise/WFK-2_1/examples/booking/booking-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/booking/booking-web/pom.xml 2012-10-11 14:50:43 UTC (rev 15283) +++ branches/enterprise/WFK-2_1/examples/booking/booking-web/pom.xml 2012-10-11 14:51:01 UTC (rev 15284) @@ -28,23 +28,17 @@ </dependency> <dependency> <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <type>ejb</type> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam-ui</artifactId> - <exclusions> - <exclusion> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam-debug</artifactId> - <exclusions> - <exclusion> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> <groupId>commons-beanutils</groupId> @@ -72,6 +66,16 @@ <groupId>org.richfaces.core</groupId> <artifactId>richfaces-core-api</artifactId> </dependency> + <dependency> + <groupId>org.jboss.spec.javax.faces</groupId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.spec.javax.servlet</groupId> + <artifactId>jboss-servlet-api_3.0_spec</artifactId> + <scope>provided</scope> + </dependency> </dependencies> <build> Modified: branches/enterprise/WFK-2_1/examples/booking/booking-web/src/main/webapp/exp/bookingExp.html =================================================================== --- branches/enterprise/WFK-2_1/examples/booking/booking-web/src/main/webapp/exp/bookingExp.html 2012-10-11 14:50:43 UTC (rev 15283) +++ branches/enterprise/WFK-2_1/examples/booking/booking-web/src/main/webapp/exp/bookingExp.html 2012-10-11 14:51:01 UTC (rev 15284) @@ -16,7 +16,7 @@ <img src="../img/header_line.gif" /> <form> - <input type="button" value="Close Window" onclick="window.close()"/> + <div><input type="button" value="Close Window" onclick="window.close()"/></div> </form> <p> @@ -151,7 +151,7 @@ <form> - <input type="button" value="Close Window" onclick="window.close()"/> + <div><input type="button" value="Close Window" onclick="window.close()"/></div> </form> </div> Modified: branches/enterprise/WFK-2_1/examples/booking/booking-web/src/main/webapp/exp/confirmExp.html =================================================================== --- branches/enterprise/WFK-2_1/examples/booking/booking-web/src/main/webapp/exp/confirmExp.html 2012-10-11 14:50:43 UTC (rev 15283) +++ branches/enterprise/WFK-2_1/examples/booking/booking-web/src/main/webapp/exp/confirmExp.html 2012-10-11 14:51:01 UTC (rev 15284) @@ -16,7 +16,7 @@ <img src="../img/header_line.gif" /> <form> - <input type="button" value="Close Window" onclick="window.close()"/> + <div><input type="button" value="Close Window" onclick="window.close()"/></div> </form> <p> @@ -94,7 +94,7 @@ </code> <form> - <input type="button" value="Close Window" onclick="window.close()"/> + <div><input type="button" value="Close Window" onclick="window.close()"/></div> </form> </div> Modified: branches/enterprise/WFK-2_1/examples/booking/booking-web/src/main/webapp/exp/introExp.html =================================================================== --- branches/enterprise/WFK-2_1/examples/booking/booking-web/src/main/webapp/exp/introExp.html 2012-10-11 14:50:43 UTC (rev 15283) +++ branches/enterprise/WFK-2_1/examples/booking/booking-web/src/main/webapp/exp/introExp.html 2012-10-11 14:51:01 UTC (rev 15284) @@ -17,7 +17,7 @@ <center> <form> - <input type="button" value="Close Window" onclick="window.close()"></input> + <div><input type="button" value="Close Window" onclick="window.close()"></input></div> </form> </center> @@ -58,7 +58,7 @@ <center> <form> - <input type="button" value="Close Window" onclick="window.close()" /> + <div><input type="button" value="Close Window" onclick="window.close()" /></div> </form> </center> Modified: branches/enterprise/WFK-2_1/examples/booking/booking-web/src/main/webapp/exp/loginExp.html =================================================================== --- branches/enterprise/WFK-2_1/examples/booking/booking-web/src/main/webapp/exp/loginExp.html 2012-10-11 14:50:43 UTC (rev 15283) +++ branches/enterprise/WFK-2_1/examples/booking/booking-web/src/main/webapp/exp/loginExp.html 2012-10-11 14:51:01 UTC (rev 15284) @@ -16,7 +16,7 @@ <img src="../img/header_line.gif" /> <center> <form> - <input type="button" value="Close Window" onclick="window.close()"/> + <div><input type="button" value="Close Window" onclick="window.close()"/></div> </form> </center> <p> @@ -30,12 +30,12 @@ <code class="block"> <div> - <h:outputLabel for="username">Login Name</h:outputLabel> - <h:inputText id="username" value="#{identity.username}" /> + <h:outputLabel for="username">Login Name</h:outputLabel> + <h:inputText id="username" value="#{identity.username}" /> </div> <div> - <h:outputLabel for="password">Password</h:outputLabel> - <h:inputSecret id="password" value="#{identity.password}" /> + <h:outputLabel for="password">Password</h:outputLabel> + <h:inputSecret id="password" value="#{identity.password}" /> </div> ... ... @@ -151,7 +151,7 @@ </p> <form> - <input type="button" value="Close Window" onclick="window.close()"/> + <div><input type="button" value="Close Window" onclick="window.close()"/></div> </form> </div> Modified: branches/enterprise/WFK-2_1/examples/booking/booking-web/src/main/webapp/exp/mainExp.html =================================================================== --- branches/enterprise/WFK-2_1/examples/booking/booking-web/src/main/webapp/exp/mainExp.html 2012-10-11 14:50:43 UTC (rev 15283) +++ branches/enterprise/WFK-2_1/examples/booking/booking-web/src/main/webapp/exp/mainExp.html 2012-10-11 14:51:01 UTC (rev 15284) @@ -16,7 +16,7 @@ <img src="../img/header_line.gif" /> <form> - <input type="button" value="Close Window" onclick="window.close()"/> + <div><input type="button" value="Close Window" onclick="window.close()"/></div> </form> <p> @@ -204,7 +204,7 @@ </code> <center> <form> - <input type="button" value="Close Window" onclick="window.close()"></input> + <div><input type="button" value="Close Window" onclick="window.close()"></input></div> </form> </center> </div> Modified: branches/enterprise/WFK-2_1/examples/booking/booking-web/src/main/webapp/exp/registerExp.html =================================================================== --- branches/enterprise/WFK-2_1/examples/booking/booking-web/src/main/webapp/exp/registerExp.html 2012-10-11 14:50:43 UTC (rev 15283) +++ branches/enterprise/WFK-2_1/examples/booking/booking-web/src/main/webapp/exp/registerExp.html 2012-10-11 14:51:01 UTC (rev 15284) @@ -16,7 +16,7 @@ <img src="img/header_line.gif" /> <form> - <input type="button" value="Close Window" onclick="window.close()"/> + <div><input type="button" value="Close Window" onclick="window.close()"/></div> </form> <p> @@ -30,7 +30,7 @@ <s:validateAll> <div class="entry"> <div class="label"> - <h:outputLabel for="username">Username:</h:outputLabel> + <h:outputLabel for="username">Username:</h:outputLabel> </div> <div class="input"> <h:inputText id="username" value="#{user.username}"/><br/> @@ -39,11 +39,11 @@ </div> <div class="entry"> <div class="label"> - <h:outputLabel for="name">Real Name:</h:outputLabel> + <h:outputLabel for="name">Real Name:</h:outputLabel> </div> <div class="input"> <h:inputText id="name" value="#{user.name}" /><br/> - <span class="errors"><h:message for="name" /></span> + <span class="errors"><h:message for="name" /></span> </div> </div> </s:validateAll> @@ -219,7 +219,7 @@ </p> <form> - <input type="button" value="Close Window" onclick="window.close()"/> + <div><input type="button" value="Close Window" onclick="window.close()"/></div> </form> </div> Modified: branches/enterprise/WFK-2_1/examples/booking/booking-web/src/main/webapp/exp/workspaceExp.html =================================================================== --- branches/enterprise/WFK-2_1/examples/booking/booking-web/src/main/webapp/exp/workspaceExp.html 2012-10-11 14:50:43 UTC (rev 15283) +++ branches/enterprise/WFK-2_1/examples/booking/booking-web/src/main/webapp/exp/workspaceExp.html 2012-10-11 14:51:01 UTC (rev 15284) @@ -17,7 +17,7 @@ <center> <form> - <input type="button" value="Close Window" onclick="window.close()"/> + <div><input type="button" value="Close Window" onclick="window.close()"/></div> </form> </center> @@ -78,7 +78,7 @@ </p> <form> - <input type="button" value="Close Window" onclick="window.close()" /> + <div><input type="button" value="Close Window" onclick="window.close()" /></div> </form> </div>

10 years, 8 months

1
0
0 / 0

Seam SVN: r15283 - branches/enterprise/WFK-2_1/examples/ui/ui-web.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2012-10-11 10:50:43 -0400 (Thu, 11 Oct 2012) New Revision: 15283 Modified: branches/enterprise/WFK-2_1/examples/ui/ui-web/pom.xml Log: ui example cleanup Modified: branches/enterprise/WFK-2_1/examples/ui/ui-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/ui/ui-web/pom.xml 2012-10-11 14:50:34 UTC (rev 15282) +++ branches/enterprise/WFK-2_1/examples/ui/ui-web/pom.xml 2012-10-11 14:50:43 UTC (rev 15283) @@ -55,6 +55,12 @@ </dependency> <dependency> + <groupId>org.jboss.spec.javax.servlet</groupId> + <artifactId>jboss-servlet-api_3.0_spec</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> <groupId>com.sun.faces</groupId> <artifactId>jsf-impl</artifactId> <scope>provided</scope>

10 years, 8 months

1
0
0 / 0

Seam SVN: r15282 - in branches/enterprise/WFK-2_1/examples/tasks: tasks-tests/src/test/java/org/jboss/seam/example/tasks/test and 1 other directories.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2012-10-11 10:50:34 -0400 (Thu, 11 Oct 2012) New Revision: 15282 Modified: branches/enterprise/WFK-2_1/examples/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/Category.java branches/enterprise/WFK-2_1/examples/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/Task.java branches/enterprise/WFK-2_1/examples/tasks/tasks-tests/src/test/java/org/jboss/seam/example/tasks/test/Deployments.java branches/enterprise/WFK-2_1/examples/tasks/tasks-web/pom.xml Log: tasks example cleanup Modified: branches/enterprise/WFK-2_1/examples/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/Category.java =================================================================== --- branches/enterprise/WFK-2_1/examples/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/Category.java 2012-10-11 14:50:13 UTC (rev 15281) +++ branches/enterprise/WFK-2_1/examples/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/Category.java 2012-10-11 14:50:34 UTC (rev 15282) @@ -46,7 +46,7 @@ @Entity @XmlRootElement @Table(uniqueConstraints = @UniqueConstraint(columnNames = { "NAME", "OWNER_USERNAME" })) -@NamedQuery(name = "categoryByNameAndUser", query = "select category from Category category where category.owner.username like :username and category.name like :category") +@NamedQuery(name = "categoryByNameAndUser", query = "select c from Category c where c.owner.username like :username and c.name like :category") public class Category { private Long id; Modified: branches/enterprise/WFK-2_1/examples/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/Task.java =================================================================== --- branches/enterprise/WFK-2_1/examples/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/Task.java 2012-10-11 14:50:13 UTC (rev 15281) +++ branches/enterprise/WFK-2_1/examples/tasks/tasks-ejb/src/main/java/org/jboss/seam/example/tasks/entity/Task.java 2012-10-11 14:50:34 UTC (rev 15282) @@ -37,7 +37,7 @@ */ @Entity @XmlRootElement -@NamedQuery(name="taskByNameAndCategory", query="select task from Task task where task.name like :task and task.category.id = :category") +@NamedQuery(name="taskByNameAndCategory", query="select t from Task t where t.name like :task and t.category.id = :category") public class Task { private Long id; Modified: branches/enterprise/WFK-2_1/examples/tasks/tasks-tests/src/test/java/org/jboss/seam/example/tasks/test/Deployments.java =================================================================== --- branches/enterprise/WFK-2_1/examples/tasks/tasks-tests/src/test/java/org/jboss/seam/example/tasks/test/Deployments.java 2012-10-11 14:50:13 UTC (rev 15281) +++ branches/enterprise/WFK-2_1/examples/tasks/tasks-tests/src/test/java/org/jboss/seam/example/tasks/test/Deployments.java 2012-10-11 14:50:34 UTC (rev 15282) @@ -6,7 +6,6 @@ import org.jboss.shrinkwrap.api.spec.WebArchive; import java.io.File; -import org.jboss.shrinkwrap.api.asset.StringAsset; public class Deployments { public static EnterpriseArchive tasksDeployment() { Modified: branches/enterprise/WFK-2_1/examples/tasks/tasks-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/tasks/tasks-web/pom.xml 2012-10-11 14:50:13 UTC (rev 15281) +++ branches/enterprise/WFK-2_1/examples/tasks/tasks-web/pom.xml 2012-10-11 14:50:34 UTC (rev 15282) @@ -55,6 +55,16 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.jboss.spec.javax.faces</groupId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.spec.javax.servlet</groupId> + <artifactId>jboss-servlet-api_3.0_spec</artifactId> + <scope>provided</scope> + </dependency> </dependencies> <build>

10 years, 8 months

1
0
0 / 0

Seam SVN: r15281 - in branches/enterprise/WFK-2_1/examples/spring/spring-web: src/main/java/org/jboss/seam/example/spring and 1 other directory.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2012-10-11 10:50:13 -0400 (Thu, 11 Oct 2012) New Revision: 15281 Modified: branches/enterprise/WFK-2_1/examples/spring/spring-web/pom.xml branches/enterprise/WFK-2_1/examples/spring/spring-web/src/main/java/org/jboss/seam/example/spring/BookingListAction.java branches/enterprise/WFK-2_1/examples/spring/spring-web/src/main/java/org/jboss/seam/example/spring/HibernateTestService.java branches/enterprise/WFK-2_1/examples/spring/spring-web/src/main/java/org/jboss/seam/example/spring/RegisterAction.java Log: spring example cleanup Modified: branches/enterprise/WFK-2_1/examples/spring/spring-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/spring/spring-web/pom.xml 2012-10-11 14:50:01 UTC (rev 15280) +++ branches/enterprise/WFK-2_1/examples/spring/spring-web/pom.xml 2012-10-11 14:50:13 UTC (rev 15281) @@ -79,6 +79,11 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>org.jboss.spec.javax.servlet</groupId> + <artifactId>jboss-servlet-api_3.0_spec</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.springframework</groupId> <artifactId>spring-orm</artifactId> </dependency> Modified: branches/enterprise/WFK-2_1/examples/spring/spring-web/src/main/java/org/jboss/seam/example/spring/BookingListAction.java =================================================================== --- branches/enterprise/WFK-2_1/examples/spring/spring-web/src/main/java/org/jboss/seam/example/spring/BookingListAction.java 2012-10-11 14:50:01 UTC (rev 15280) +++ branches/enterprise/WFK-2_1/examples/spring/spring-web/src/main/java/org/jboss/seam/example/spring/BookingListAction.java 2012-10-11 14:50:13 UTC (rev 15281) @@ -30,7 +30,6 @@ @In private User user; - @SuppressWarnings("unused") @DataModel private List<Booking> bookings; @DataModelSelection Modified: branches/enterprise/WFK-2_1/examples/spring/spring-web/src/main/java/org/jboss/seam/example/spring/HibernateTestService.java =================================================================== --- branches/enterprise/WFK-2_1/examples/spring/spring-web/src/main/java/org/jboss/seam/example/spring/HibernateTestService.java 2012-10-11 14:50:01 UTC (rev 15280) +++ branches/enterprise/WFK-2_1/examples/spring/spring-web/src/main/java/org/jboss/seam/example/spring/HibernateTestService.java 2012-10-11 14:50:13 UTC (rev 15281) @@ -3,10 +3,8 @@ */ package org.jboss.seam.example.spring; -import java.sql.SQLException; import java.util.List; -import org.hibernate.HibernateException; import org.hibernate.Session; import org.hibernate.SessionFactory; import org.springframework.transaction.TransactionStatus; Modified: branches/enterprise/WFK-2_1/examples/spring/spring-web/src/main/java/org/jboss/seam/example/spring/RegisterAction.java =================================================================== --- branches/enterprise/WFK-2_1/examples/spring/spring-web/src/main/java/org/jboss/seam/example/spring/RegisterAction.java 2012-10-11 14:50:01 UTC (rev 15280) +++ branches/enterprise/WFK-2_1/examples/spring/spring-web/src/main/java/org/jboss/seam/example/spring/RegisterAction.java 2012-10-11 14:50:13 UTC (rev 15281) @@ -21,7 +21,6 @@ @In("#{hibernateTestService}") private HibernateTestService hibernateTestService; - @SuppressWarnings("unused") @In("hotelSearch") private HotelSearchingAction hotelSearchingAction;

10 years, 8 months

1
0
0 / 0

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

seam-commits October 2012