Seam SVN: r8028 - in trunk/examples/seamspace/view: style and 1 other directory.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-04-25 23:07:45 -0400 (Fri, 25 Apr 2008)
New Revision: 8028
Added:
trunk/examples/seamspace/view/style/security.css
trunk/examples/seamspace/view/style/table_header.png
Modified:
trunk/examples/seamspace/view/roledetail.xhtml
trunk/examples/seamspace/view/rolemanager.xhtml
trunk/examples/seamspace/view/security.xhtml
trunk/examples/seamspace/view/style/seamspace.css
trunk/examples/seamspace/view/template.xhtml
trunk/examples/seamspace/view/userdetail.xhtml
trunk/examples/seamspace/view/usermanager.xhtml
Log:
styling of identity management screens
Modified: trunk/examples/seamspace/view/roledetail.xhtml
===================================================================
--- trunk/examples/seamspace/view/roledetail.xhtml 2008-04-25 15:47:35 UTC (rev 8027)
+++ trunk/examples/seamspace/view/roledetail.xhtml 2008-04-26 03:07:45 UTC (rev 8028)
@@ -7,6 +7,10 @@
xmlns:s="http://jboss.com/products/seam/taglib">
<ui:composition template="template.xhtml">
+
+ <ui:define name="header">
+ <link href="style/security.css" rel="stylesheet" type="text/css"/>
+ </ui:define>
<ui:define name="content">
Modified: trunk/examples/seamspace/view/rolemanager.xhtml
===================================================================
--- trunk/examples/seamspace/view/rolemanager.xhtml 2008-04-25 15:47:35 UTC (rev 8027)
+++ trunk/examples/seamspace/view/rolemanager.xhtml 2008-04-26 03:07:45 UTC (rev 8028)
@@ -7,6 +7,10 @@
<ui:composition template="template.xhtml">
+ <ui:define name="header">
+ <link href="style/security.css" rel="stylesheet" type="text/css"/>
+ </ui:define>
+
<ui:define name="content">
<script type="text/javascript">
@@ -26,8 +30,11 @@
id="threads"
value="#{roles}"
var="role"
- styleClass="default"
- columnClasses=",,enabled,action">
+ styleClass="security"
+ cellspacing="0"
+ headerClass="header"
+ rowClasses="odd,even"
+ columnClasses=",,action">
<h:column width="auto">
<f:facet name="header">Role</f:facet>
#{role}
Modified: trunk/examples/seamspace/view/security.xhtml
===================================================================
--- trunk/examples/seamspace/view/security.xhtml 2008-04-25 15:47:35 UTC (rev 8027)
+++ trunk/examples/seamspace/view/security.xhtml 2008-04-26 03:07:45 UTC (rev 8028)
@@ -7,6 +7,10 @@
<ui:composition template="template.xhtml">
+ <ui:define name="header">
+ <link href="style/security.css" rel="stylesheet" type="text/css"/>
+ </ui:define>
+
<ui:define name="content">
<div id="contentMain">
Modified: trunk/examples/seamspace/view/style/seamspace.css
===================================================================
--- trunk/examples/seamspace/view/style/seamspace.css 2008-04-25 15:47:35 UTC (rev 8027)
+++ trunk/examples/seamspace/view/style/seamspace.css 2008-04-26 03:07:45 UTC (rev 8028)
@@ -419,6 +419,10 @@
font-size: 0px;
}
+.divider {
+ color: #aaaaaa;
+}
+
div.errors {
color: #ff0000;
font-weight: bold;
@@ -500,54 +504,6 @@
display: block;
}
-input.newuser {
- background: url(btn_newuser.png) top left no-repeat;
- height: 39px;
- width: 113px;
- margin: 4px 4px 4px 4px;
- border: 0px;
- cursor: pointer;
-}
-
-input.newrole {
- background: url(btn_newrole.png) top left no-repeat;
- height: 39px;
- width: 113px;
- margin: 4px 4px 4px 4px;
- border: 0px;
- cursor: pointer;
-}
-
-input.manageusers {
- display: block;
- background: url(manage_users.png) top left no-repeat;
- height: 88px;
- width: 400px;
- padding-left: 10px;
- font-size: 19px;
- font-weight: bold;
- color: #333333;
- border: 0px;
- cursor: pointer;
- margin-top: 30px;
- margin-left: 90px;
-}
-
-input.manageroles {
- display: block;
- background: url(manage_roles.png) top left no-repeat;
- height: 88px;
- width: 400px;
- padding-left: 10px;
- font-size: 19px;
- font-weight: bold;
- color: #333333;
- border: 0px;
- cursor: pointer;
- margin-top: 30px;
- margin-left: 90px;
-}
-
/* General form styles */
div.formRow {
@@ -601,27 +557,3 @@
float: right;
padding: 4px 8px 16px 2px;
}
-
-div.checkmark {
- background: url(../images/checkmark.png) top left no-repeat;
- width: 14px;
- height: 15px;
- margin-left: auto;
- margin-right: auto;
-}
-
-div.cross {
- background: url(../images/cross.png) top left no-repeat;
- width: 14px;
- height: 15px;
- margin-left: auto;
- margin-right: auto;
-}
-
-td.enabled {
- text-align: center;
-}
-
-td.action {
- text-align: right;
-}
\ No newline at end of file
Added: trunk/examples/seamspace/view/style/security.css
===================================================================
--- trunk/examples/seamspace/view/style/security.css (rev 0)
+++ trunk/examples/seamspace/view/style/security.css 2008-04-26 03:07:45 UTC (rev 8028)
@@ -0,0 +1,117 @@
+input.newuser {
+ background: url(btn_newuser.png) top left no-repeat;
+ height: 39px;
+ width: 113px;
+ margin: 4px 4px 4px 4px;
+ border: 0px;
+ cursor: pointer;
+}
+
+input.newrole {
+ background: url(btn_newrole.png) top left no-repeat;
+ height: 39px;
+ width: 113px;
+ margin: 4px 4px 4px 4px;
+ border: 0px;
+ cursor: pointer;
+}
+
+input.manageusers {
+ display: block;
+ background: url(manage_users.png) top left no-repeat;
+ height: 88px;
+ width: 300px;
+ padding-left: 10px;
+ font-size: 19px;
+ font-weight: bold;
+ color: #333333;
+ border: 0px;
+ cursor: pointer;
+ margin-top: 20px;
+ margin-left: 20px;
+}
+
+input.manageroles {
+ display: block;
+ background: url(manage_roles.png) top left no-repeat;
+ height: 88px;
+ width: 300px;
+ padding-left: 10px;
+ font-size: 19px;
+ font-weight: bold;
+ color: #333333;
+ border: 0px;
+ cursor: pointer;
+ margin-top: 20px;
+ margin-left: 20px;
+}
+
+.roles {
+ width: 120px;
+ border: 1px solid #7F9DB9;
+ background-color: #E7EDF7;
+}
+
+div.selectMany label {
+ float: none;
+}
+
+.formButton {
+ background: url(../images/bg_button.png) top left repeat-x;
+ border: 1px solid #003399;
+ font-size: small;
+ font-weight: bold;
+ color: #000000;
+ margin-right: 8px;
+ padding-left: 4px;
+ padding-right: 4px;
+}
+
+div.formButtons {
+ float: right;
+ padding: 4px 8px 16px 2px;
+}
+
+div.checkmark {
+ background: url(../images/checkmark.png) top left no-repeat;
+ width: 14px;
+ height: 15px;
+ margin-left: auto;
+ margin-right: auto;
+}
+
+div.cross {
+ background: url(../images/cross.png) top left no-repeat;
+ width: 14px;
+ height: 15px;
+ margin-left: auto;
+ margin-right: auto;
+}
+
+table.security {
+ border: 1px solid black;
+ width: 500px;
+}
+
+th.header {
+ background: url(table_header.png) top left repeat-x;
+ color: #ffffff;
+ padding-top: 3px;
+ padding-bottom: 3px;
+}
+
+tr.odd {
+ background-color: #ffffff;
+}
+
+tr.even {
+ background-color: #E9F5FF;
+}
+
+td.enabled {
+ text-align: center;
+}
+
+td.action {
+ text-align: right;
+}
\ No newline at end of file
Added: trunk/examples/seamspace/view/style/table_header.png
===================================================================
(Binary files differ)
Property changes on: trunk/examples/seamspace/view/style/table_header.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/examples/seamspace/view/template.xhtml
===================================================================
--- trunk/examples/seamspace/view/template.xhtml 2008-04-25 15:47:35 UTC (rev 8027)
+++ trunk/examples/seamspace/view/template.xhtml 2008-04-26 03:07:45 UTC (rev 8028)
@@ -9,6 +9,7 @@
<title>SeamSpace</title>
<link href="style/seamspace.css" rel="stylesheet" type="text/css"/>
<link href="style/date.css" rel="stylesheet" type="text/css"/>
+ <ui:insert name="header"/>
</head>
<body>
@@ -18,7 +19,7 @@
<div class="headerMenu">
<!--s:link action="" value="SignUp"/-->
<s:fragment rendered="#{s:hasRole('admin')}">
- <s:link view="/security.xhtml" value="Security" propagation="none"/> |
+ <s:link view="/security.xhtml" value="Security" propagation="none"/><h:outputText styleClass="divider" value=" | "/>
</s:fragment>
<s:link action="#{identity.logout}" value="Log out" rendered="#{identity.loggedIn}"/>
@@ -27,9 +28,9 @@
<br style="clear:both"/>
<h:form>
<div>
- <a href="#">SeamSpace</a>|
- <a href="#">People</a>|
- <a href="#">Music</a>|
+ <a href="#">SeamSpace</a><h:outputText styleClass="divider" value=" | "/>
+ <a href="#">People</a><h:outputText styleClass="divider" value=" | "/>
+ <a href="#">Music</a><h:outputText styleClass="divider" value=" | "/>
<a href="#">Blogs</a>
</div>
<div id="search">
@@ -41,9 +42,9 @@
</div>
<div id="menubar">
- <s:link view="/home.xhtml" value="Home" propagation="none"/>|
- <s:link value="Browse" onclick="javascript:alert('This feature coming soon!');return false"/>|
- <s:link value="Blog" onclick="javascript:alert('This feature coming soon!');return false"/>|
+ <s:link view="/home.xhtml" value="Home" propagation="none"/><h:outputText styleClass="divider" value=" | "/>
+ <s:link value="Browse" onclick="javascript:alert('This feature coming soon!');return false"/><h:outputText styleClass="divider" value=" | "/>
+ <s:link value="Blog" onclick="javascript:alert('This feature coming soon!');return false"/><h:outputText styleClass="divider" value=" | "/>
<s:link value="Music" onclick="javascript:alert('This feature coming soon!');return false"/>
</div>
Modified: trunk/examples/seamspace/view/userdetail.xhtml
===================================================================
--- trunk/examples/seamspace/view/userdetail.xhtml 2008-04-25 15:47:35 UTC (rev 8027)
+++ trunk/examples/seamspace/view/userdetail.xhtml 2008-04-26 03:07:45 UTC (rev 8028)
@@ -7,6 +7,10 @@
xmlns:s="http://jboss.com/products/seam/taglib">
<ui:composition template="template.xhtml">
+
+ <ui:define name="header">
+ <link href="style/security.css" rel="stylesheet" type="text/css"/>
+ </ui:define>
<ui:define name="content">
Modified: trunk/examples/seamspace/view/usermanager.xhtml
===================================================================
--- trunk/examples/seamspace/view/usermanager.xhtml 2008-04-25 15:47:35 UTC (rev 8027)
+++ trunk/examples/seamspace/view/usermanager.xhtml 2008-04-26 03:07:45 UTC (rev 8028)
@@ -6,6 +6,10 @@
xmlns:s="http://jboss.com/products/seam/taglib">
<ui:composition template="template.xhtml">
+
+ <ui:define name="header">
+ <link href="style/security.css" rel="stylesheet" type="text/css"/>
+ </ui:define>
<ui:define name="content">
@@ -26,7 +30,10 @@
id="threads"
value="#{users}"
var="user"
- styleClass="default"
+ styleClass="security"
+ cellspacing="0"
+ headerClass="header"
+ rowClasses="odd,even"
columnClasses=",,enabled,action">
<h:column width="auto">
<f:facet name="header">
16 years, 1 month
- 1
- 0
Seam SVN: r8027 - trunk/build.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-04-25 11:47:35 -0400 (Fri, 25 Apr 2008)
New Revision: 8027
Modified:
trunk/build/gen.pom.xml
trunk/build/root.pom.xml
Log:
minor
Modified: trunk/build/gen.pom.xml
===================================================================
--- trunk/build/gen.pom.xml 2008-04-25 15:32:51 UTC (rev 8026)
+++ trunk/build/gen.pom.xml 2008-04-25 15:47:35 UTC (rev 8027)
@@ -52,6 +52,12 @@
</dependency>
<dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>common</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.eclipse</groupId>
<artifactId>text</artifactId>
<scope>runtime</scope>
Modified: trunk/build/root.pom.xml
===================================================================
--- trunk/build/root.pom.xml 2008-04-25 15:32:51 UTC (rev 8026)
+++ trunk/build/root.pom.xml 2008-04-25 15:47:35 UTC (rev 8027)
@@ -982,6 +982,12 @@
</dependency>
<dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>common</artifactId>
+ <version>3.2.0-v20060303</version>
+ </dependency>
+
+ <dependency>
<groupId>org.eclipse.core</groupId>
<artifactId>runtime</artifactId>
<version>3.2.0-v20060303</version>
@@ -1003,6 +1009,10 @@
<artifactId>preferences</artifactId>
</exclusion>
<exclusion>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>common</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.eclipse.core</groupId>
<artifactId>contenttype</artifactId>
</exclusion>
@@ -1018,6 +1028,10 @@
<groupId>org.eclipse.core</groupId>
<artifactId>commands</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>common</artifactId>
+ </exclusion>
</exclusions>
</dependency>
16 years, 1 month
- 1
- 0
Seam SVN: r8026 - in trunk: build and 6 other directories.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-04-25 11:32:51 -0400 (Fri, 25 Apr 2008)
New Revision: 8026
Removed:
trunk/examples/dvdstore/lib/standard.jar
trunk/examples/remoting/gwt/lib/
trunk/extras/emma/
trunk/seam-gen/lib/
Modified:
trunk/build.xml
trunk/build/common.build.xml
trunk/build/gen.pom.xml
trunk/build/root.pom.xml
trunk/examples/build.xml
trunk/examples/remoting/gwt/build.xml
trunk/examples/wiki/build.xml
trunk/seam-gen/build.xml
Log:
move more jars
Modified: trunk/build/common.build.xml
===================================================================
--- trunk/build/common.build.xml 2008-04-25 14:49:24 UTC (rev 8025)
+++ trunk/build/common.build.xml 2008-04-25 15:32:51 UTC (rev 8026)
@@ -156,6 +156,13 @@
</copyInlineDependencies>
<property name="copyjbossembeddeddone" value="true" />
</target>
+
+ <target name="getemma">
+ <inlineDependency id="emma" scope="runtime">
+ <dependency groupId="emma" artifactId="emma" version="2.0.5312" />
+ <dependency groupId="emma" artifactId="emma_ant" version="2.0.5312" />
+ </inlineDependency>
+ </target>
<macrodef name="deploySeam">
<attribute name="repositoryId" />
Modified: trunk/build/gen.pom.xml
===================================================================
--- trunk/build/gen.pom.xml 2008-04-25 14:49:24 UTC (rev 8025)
+++ trunk/build/gen.pom.xml 2008-04-25 15:32:51 UTC (rev 8026)
@@ -1,26 +1,63 @@
<?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">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-gen</artifactId>
- <parent>
- <groupId>org.jboss.seam</groupId>
- <artifactId>parent</artifactId>
- <version>@seam.version@</version>
- </parent>
-
- <!-- See parent pom for notes on how to declare dependencies -->
+ 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>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-gen</artifactId>
+ <parent>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>parent</artifactId>
+ <version>@seam.version@</version>
+ </parent>
- <dependencies>
-
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- </dependency>
-
- </dependencies>
+ <!-- See parent pom for notes on how to declare dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-tools</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>runtime</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse</groupId>
+ <artifactId>text</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ </dependencies>
+
+
</project>
\ No newline at end of file
Modified: trunk/build/root.pom.xml
===================================================================
--- trunk/build/root.pom.xml 2008-04-25 14:49:24 UTC (rev 8025)
+++ trunk/build/root.pom.xml 2008-04-25 15:32:51 UTC (rev 8026)
@@ -963,6 +963,65 @@
<version>1.4.2</version>
</dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-tools</artifactId>
+ <version>3.2.0.ga</version>
+ </dependency>
+
+ <dependency>
+ <groupId>freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ <version>2.3.8</version>
+ </dependency>
+
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>runtime</artifactId>
+ <version>3.2.0-v20060303</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse</groupId>
+ <artifactId>osgi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>jobs</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>registry</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>preferences</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>contenttype</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse</groupId>
+ <artifactId>text</artifactId>
+ <version>3.2.0-v20060605-1400</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.core</groupId>
+ <artifactId>commands</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+
</dependencies>
</dependencyManagement>
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2008-04-25 14:49:24 UTC (rev 8025)
+++ trunk/build.xml 2008-04-25 15:32:51 UTC (rev 8026)
@@ -106,11 +106,6 @@
<property name="javac.debug" value="true" />
<property name="javac.deprecation" value="false" />
- <path id="classpath.emma">
- <pathelement location="${basedir}/extras/emma/emma.jar" />
- <pathelement location="${basedir}/extras/emma/emma_ant.jar" />
- </path>
-
<fileset id="eejb.conf" dir="${eejb.conf.dir}">
<include name="**/*.*" />
</fileset>
@@ -666,7 +661,7 @@
</target>
- <target name="unittest" depends="inittestcore,compiletest" description="Run the Unit tests">
+ <target name="unittest" depends="inittestcore,compiletest,getemma" description="Run the Unit tests">
<taskdef resource="testngtasks" classpathref="test.core.path" />
<testng>
<jvmarg value="-Demma.coverage.out.file=${coverage.ec}" />
@@ -674,7 +669,7 @@
<classpath>
<path path="${classes.test.core.dir}" />
<path path="${classes.test.dir}" />
- <path refid="classpath.emma" />
+ <path refid="runtime.emma.path" />
<path refid="test.core.path" />
<pathelement location="${lib.dir}/jboss-seam-remoting.jar" />
</classpath>
@@ -715,8 +710,8 @@
</copy>
</target>
- <target name="instrumentcore" depends="compilecore">
- <taskdef resource="emma_ant.properties" classpathref="classpath.emma" />
+ <target name="instrumentcore" depends="compilecore,getemma">
+ <taskdef resource="emma_ant.properties" classpathref="runtime.emma.path" />
<mkdir dir="${coverage.dir}/core" />
<emma>
<instr instrpath="${classes.core.dir}" mode="overwrite" metadatafile="${coverage.dir}/coveragecore.em">
@@ -729,8 +724,8 @@
</emma>
</target>
- <target name="instrumentmail" depends="compilemail">
- <taskdef resource="emma_ant.properties" classpathref="classpath.emma" />
+ <target name="instrumentmail" depends="compilemail,getemma">
+ <taskdef resource="emma_ant.properties" classpathref="runtime.emma.path" />
<mkdir dir="${coverage.dir}/mail" />
<emma>
<instr instrpath="${classes.mail.dir}" mode="overwrite" metadatafile="${coverage.dir}/coveragemail.em">
@@ -742,8 +737,8 @@
<!-- Deprecated -->
<target name="coverage" depends="instrumentcore, instrumentmail, testall, coveragereport" />
- <target name="coveragereport" description="Create the coverage report">
- <taskdef resource="emma_ant.properties" classpathref="classpath.emma" />
+ <target name="coveragereport" depends="getemma" description="Create the coverage report">
+ <taskdef resource="emma_ant.properties" classpathref="runtime.emma.path" />
<emma>
<report depth="method">
<sourcepath>
Modified: trunk/examples/build.xml
===================================================================
--- trunk/examples/build.xml 2008-04-25 14:49:24 UTC (rev 8025)
+++ trunk/examples/build.xml 2008-04-25 15:32:51 UTC (rev 8026)
@@ -465,10 +465,6 @@
<path refid="build.classpath.extras" />
</path>
- <path id="emma.classpath">
- <fileset dir="${seam.dir}/extras/emma/*.jar" />
- </path>
-
<path id="test.classpath">
<path path="${test.dir}" />
<fileset dir="${lib.dir}/test">
@@ -483,7 +479,6 @@
<path path="${eejb.conf.dir}" />
<path refid="test.classpath.extras" />
<path refid="build.classpath.extras" />
- <path refid="emma.classpath" />
<path location="${seam.dir}/src/test/resources/log4j.xml" />
</path>
@@ -912,11 +907,6 @@
You can test the example by running the test target.
-->
- <path id="emma.classpath">
- <pathelement location="${seam.dir}/extras/emma/emma.jar" />
- <pathelement location="${seam.dir}/extras/emma/emma_ant.jar" />
- </path>
-
<target name="validateConfiguration" description="Validate XML Configuration files">
<echo message="Validating configuaration files for ${Name}" />
<ant antfile="${build.dir}/validate.xml" target="validateConfiguration">
@@ -952,7 +942,7 @@
</copy>
</target>
- <target name="test" depends="buildtest, copyjbossembedded" description="Run the tests">
+ <target name="test" depends="buildtest, copyjbossembedded,getemma" description="Run the tests">
<taskdef resource="testngtasks" classpathref="build.classpath" />
<testng outputdir="${test-report.dir}">
<jvmarg value="-Xmx800M" />
@@ -960,13 +950,16 @@
<jvmarg value="-Demma.coverage.out.file=${coverage.ec}" />
<jvmarg value="-Djava.endorsed.dirs=${endorsed.dir}" />
<jvmarg value="${testng.jvmargs}" />
- <classpath refid="test.classpath" />
+ <classpath>
+ <path refid="test.classpath" />
+ <path refid="runtime.emma.path" />
+ </classpath>
<xmlfileset dir="${src.test.dir}" includes="**/testng.xml" />
</testng>
<echo>You can increase the logging by editing bootstrap/log4j.xml</echo>
</target>
- <target name="testclass" depends="buildtest, copyjbossembedded" description="Run a specific test">
+ <target name="testclass" depends="buildtest, copyjbossembedded,getemma" description="Run a specific test">
<taskdef resource="testngtasks" classpathref="build.classpath" />
<testng outputdir="${test-report.dir}" testname="${className}" suitename="${className}" >
<jvmarg value="-Xmx800M" />
@@ -974,7 +967,10 @@
<jvmarg value="-Demma.coverage.out.file=${coverage.ec}" />
<jvmarg value="-Djava.endorsed.dirs=${endorsed.dir}" />
<jvmarg value="${testng.jvmargs}" />
- <classpath refid="test.classpath" />
+ <classpath>
+ <path refid="test.classpath" />
+ <path refid="runtime.emma.path" />
+ </classpath>
<classfileset dir="${test.dir}" includes="**/${className}.class"/>
</testng>
<echo>You can increase the logging by editing bootstrap/log4j.xml</echo>
Deleted: trunk/examples/dvdstore/lib/standard.jar
===================================================================
(Binary files differ)
Modified: trunk/examples/remoting/gwt/build.xml
===================================================================
--- trunk/examples/remoting/gwt/build.xml 2008-04-25 14:49:24 UTC (rev 8025)
+++ trunk/examples/remoting/gwt/build.xml 2008-04-25 15:32:51 UTC (rev 8026)
@@ -11,12 +11,17 @@
<property name="gwt.lib" value="yes" />
<import file="../../build.xml" />
+
+ <inlineDependencies id="gwttasks" scope="runtime">
+ <dependency groupId="de.samaflost" artifactId="gwttasks" version="1" />
+ </inlineDependencies>
<!-- EXTRAS -->
<taskdef
uri="antlib:de.samaflost.gwttasks"
resource="de/samaflost/gwttasks/antlib.xml"
- classpath="./lib/gwttasks.jar" />
+ classpathref="runtime.gwttasks.path"
+ />
<property file="build.properties" />
Modified: trunk/examples/wiki/build.xml
===================================================================
--- trunk/examples/wiki/build.xml 2008-04-25 14:49:24 UTC (rev 8025)
+++ trunk/examples/wiki/build.xml 2008-04-25 15:32:51 UTC (rev 8026)
@@ -78,9 +78,6 @@
<include name="*.jar" />
</fileset>
- <!-- Add EMMA to the classpath for coverage support -->
- <pathelement location="${seam.dir}/extras/emma/emma.jar" />
- <pathelement location="${seam.dir}/extras/emma/emma_ant.jar" />
</path>
<path id="tools.classpath">
@@ -403,7 +400,7 @@
<!-- ######################## TESTS ################## -->
- <target name="compiletests" depends="clean, compileclasses, copyjbossembedded"
+ <target name="compiletests" depends="clean, compileclasses, copyjbossembedded,getemma"
description="Compile the test Java source code">
<javac classpathref="test.classpath"
@@ -411,7 +408,10 @@
debug="${javac.debug}"
deprecation="${javac.deprecation}"
nowarn="${javac.nowarn}">
- <classpath path="${classes.dir}"/>
+ <classpath>
+ <path refid="test.classpath" />
+ <path refid="runtime.emma.path" />
+ </classpath>
<src path="${src.test.dir}" />
</javac>
@@ -470,11 +470,14 @@
</target>
- <target name="test" depends="configuretests"
+ <target name="test" depends="configuretests,getemma"
description="Run tests defined in *.tng.xml">
<taskdef resource="testngtasks" classpathref="test.classpath"/>
<testng outputdir="${test.output.dir}">
- <classpath refid="test.classpath"/>
+ <classpath>
+ <path refid="test.classpath" />
+ <path refid="runtime.emma.path" />
+ </classpath>
<xmlfileset dir="${src.test.dir}" includes="*.tng.xml" />
<jvmarg line="${testng.jvmargs}"/>
<jvmarg value="-Demma.coverage.out.file=${coverage.ec}" />
Modified: trunk/seam-gen/build.xml
===================================================================
--- trunk/seam-gen/build.xml 2008-04-25 14:49:24 UTC (rev 8025)
+++ trunk/seam-gen/build.xml 2008-04-25 15:32:51 UTC (rev 8026)
@@ -8,8 +8,8 @@
<property file="./build.properties" />
<import file="${seam.dir}/build/common.build.xml" />
- <target name="init">
- <path id="seam-gen.path" path="${seam.dir}/lib/jboss-seam-gen.jar" />
+ <target name="init" depends="initpoms">
+ <path id="seam-gen.path" path="${seam.dir}/lib/jboss-seam-gen.jar" />
<!-- taskdefs -->
<taskdef name="normalizeProjectName"
@@ -38,7 +38,9 @@
<taskdef name="pathFixer"
classname="org.jboss.seam.tool.FixPathTask"
- classpathref="seam-gen.path"/>
+ classpathref="seam-gen.path"/>
+
+ <copyDependencies pom="${gen.pom}" id="gen" scope="runtime" todir="${lib.dir}/gen" />
</target>
<target name="init-properties" depends="init">
@@ -1048,7 +1050,7 @@
<target name="init-generate">
<path id="htools.classpath">
- <fileset dir="lib">
+ <fileset dir="${lib.dir}/gen">
<include name="*.jar"/>
</fileset>
<pathelement path="../lib/dom4j.jar" />
16 years, 1 month
- 1
- 0
Seam SVN: r8025 - branches/Seam_2_0/examples/icefaces/resources/WEB-INF.
by seam-commits＠lists.jboss.org
Author: jguglielmin
Date: 2008-04-25 10:49:24 -0400 (Fri, 25 Apr 2008)
New Revision: 8025
Modified:
branches/Seam_2_0/examples/icefaces/resources/WEB-INF/web.xml
Log:
JBPAPP-477 just required concurrentDOMViews set to true in web.xml (tested with ICEfaces-v1.6.1 and v1.7.0)
Modified: branches/Seam_2_0/examples/icefaces/resources/WEB-INF/web.xml
===================================================================
--- branches/Seam_2_0/examples/icefaces/resources/WEB-INF/web.xml 2008-04-25 14:25:28 UTC (rev 8024)
+++ branches/Seam_2_0/examples/icefaces/resources/WEB-INF/web.xml 2008-04-25 14:49:24 UTC (rev 8025)
@@ -74,7 +74,10 @@
<param-name>com.icesoft.faces.standardRequestScope</param-name>
<param-value>true</param-value>
</context-param>
-
+ <context-param>
+ <param-name>com.icesoft.faces.concurrentDOMViews</param-name>
+ <param-value>true</param-value>
+ </context-param>
<!-- servlets -->
<servlet>
<servlet-name>Faces Servlet</servlet-name>
16 years, 1 month
- 1
- 0
Seam SVN: r8024 - in trunk: build/maven/conf and 5 other directories.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-04-25 10:25:28 -0400 (Fri, 25 Apr 2008)
New Revision: 8024
Removed:
trunk/examples/jpa/lib/
Modified:
trunk/build/ci.build.xml
trunk/build/common.build.xml
trunk/build/maven/conf/settings.xml
trunk/build/utilities.build.xml
trunk/examples/build.xml
trunk/examples/hibernate/build-glassfish.xml
trunk/examples/hibernate/build-jboss405.xml
trunk/examples/hibernate/build-tomcat55.xml
trunk/examples/hibernate/build-weblogic92.xml
trunk/examples/hibernate/build-websphere61.xml
trunk/examples/jee5/booking/build.xml
trunk/examples/jpa/build-glassfish.xml
trunk/examples/jpa/build-jboss405.xml
trunk/examples/jpa/build-tomcat55.xml
trunk/examples/jpa/build-tomcat6.xml
trunk/examples/jpa/build-weblogic10.xml
trunk/examples/jpa/build-weblogic92.xml
trunk/examples/jpa/build-websphere61.xml
trunk/examples/seamdiscs/build.xml
Log:
JBSEAM-2909 and JBSEAM-2919 (first attempt)
Modified: trunk/build/ci.build.xml
===================================================================
--- trunk/build/ci.build.xml 2008-04-25 14:22:28 UTC (rev 8023)
+++ trunk/build/ci.build.xml 2008-04-25 14:25:28 UTC (rev 8024)
@@ -40,16 +40,12 @@
<target name="tests-java16">
<build target="cleanall" />
- <artifact:dependencies filesetId="endorsed.fileset" versionsId="endorsed.versions">
+ <copyInlineDependencies id="endorsed" scope="compile" todir="${endorsed.dir}">
<dependency groupId="javax.xml.bind" artifactId="jaxb-api" version="2.1">
<exclusion groupId="javax.xml.stream" artifactId="stax-api" />
<exclusion groupId="javax.activation" artifactId="activation" />
</dependency>
- </artifact:dependencies>
- <copy todir="${endorsed.dir}">
- <fileset refid="endorsed.fileset" />
- <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${endorsed.versions}" to="flatten" />
- </copy>
+ </copyInlineDependencies>
<build target="testall" testngjvmargs="-Dsun.lang.ClassLoader.allowArraySyntax=true"/>
<build target="copytestoutput" />
<build target="testreport" />
Modified: trunk/build/common.build.xml
===================================================================
--- trunk/build/common.build.xml 2008-04-25 14:22:28 UTC (rev 8023)
+++ trunk/build/common.build.xml 2008-04-25 14:25:28 UTC (rev 8024)
@@ -129,7 +129,7 @@
</target>
<target name="copyseam" if="mavenized.property" unless="copyseamdone" depends="initcopy, initpoms">
- <artifact:dependencies filesetId="seam.fileset" versionsId="seam.versions">
+ <copyInlineDependencies id="seam" scope="compile" todir="${lib.dir}">
<dependency groupId="org.jboss.seam" artifactId="jboss-seam" version="${complete.version}" />
<dependency groupId="org.jboss.seam" artifactId="jboss-seam-debug" version="${complete.version}" />
<dependency groupId="org.jboss.seam" artifactId="jboss-seam-wicket" version="${complete.version}" />
@@ -138,16 +138,12 @@
<dependency groupId="org.jboss.seam" artifactId="jboss-seam-pdf" version="${complete.version}" />
<dependency groupId="org.jboss.seam" artifactId="jboss-seam-remoting" version="${complete.version}" />
<dependency groupId="org.jboss.seam" artifactId="jboss-seam-ui" version="${complete.version}" />
- </artifact:dependencies>
- <copy todir="${lib.dir}">
- <fileset refid="seam.fileset" />
- <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${seam.versions}" to="flatten" />
- </copy>
+ </copyInlineDependencies>
<property name="copyseamdone" value="true" />
</target>
<target name="copyjbossembedded" if="mavenized.property" unless="copyjbossembeddeddone" depends="initpoms, initcopy">
- <artifact:dependencies filesetId="embeddedjboss.fileset" versionsId="embeddedjboss.versions">
+ <copyInlineDependencies id="embeddedjboss" scope="compile" todir="${lib.dir}/test">
<dependency groupId="org.jboss.seam.embedded" artifactId="jboss-embedded-all" version="${embedded.version}">
<!-- Exclude the embedded api, its a dep of Seam core -->
<exclusion groupId="org.jboss.seam.embedded" artifactId="jboss-embedded-api" />
@@ -157,11 +153,7 @@
<remoteRepository refId="repository.jboss.org" />
<remoteRepository id="snapshots.jboss.org" url="http://snapshots.jboss.org/maven2" />
- </artifact:dependencies>
- <copy todir="${lib.dir}/test">
- <fileset refid="embeddedjboss.fileset" />
- <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${embeddedjboss.versions}" to="flatten" />
- </copy>
+ </copyInlineDependencies>
<property name="copyjbossembeddeddone" value="true" />
</target>
Modified: trunk/build/maven/conf/settings.xml
===================================================================
--- trunk/build/maven/conf/settings.xml 2008-04-25 14:22:28 UTC (rev 8023)
+++ trunk/build/maven/conf/settings.xml 2008-04-25 14:25:28 UTC (rev 8024)
@@ -140,6 +140,12 @@
<url>http://my.repository.com/repo/path</url>
</mirror>
-->
+ <mirror>
+ <id>fake.mirror.of.central</id>
+ <mirrorOf>central</mirrorOf>
+ <name>Fake mirror of central - reroutes central to repository.jboss.org</name>
+ <url>http://repository.jboss.org/maven2</url>
+ </mirror>
</mirrors>
<!-- profiles
Modified: trunk/build/utilities.build.xml
===================================================================
--- trunk/build/utilities.build.xml 2008-04-25 14:22:28 UTC (rev 8023)
+++ trunk/build/utilities.build.xml 2008-04-25 14:25:28 UTC (rev 8024)
@@ -31,18 +31,29 @@
<attribute name="scope" />
<attribute name="pom" />
<sequential>
- <artifact:dependencies pathId="@{scope}.(a){id}.path" filesetId="@{scope}.(a){id}.fileset" versionsId="@{scope}.(a){id}.versions" useScope="@{scope}">
+ <artifact:dependencies pathId="@{scope}.(a){id}.path" filesetId="@{scope}.(a){id}.fileset" versionsId="@{scope}.(a){id}.versions" useScope="@{scope}" settingsFile="${maven.dir}/conf/settings.xml">
<pom file="@{pom}" />
</artifact:dependencies>
</sequential>
</macrodef>
+ <macrodef name="inlineDependencies">
+ <attribute name="id" />
+ <attribute name="scope" />
+ <element name="inline" implicit="true"/>
+ <sequential>
+ <artifact:dependencies pathId="@{scope}.(a){id}.path" filesetId="@{scope}.(a){id}.fileset" versionsId="@{scope}.(a){id}.versions" useScope="@{scope}" settingsFile="${maven.dir}/conf/settings.xml">
+ <inline />
+ </artifact:dependencies>
+ </sequential>
+ </macrodef>
+
<macrodef name="dependenciesWithSources">
<attribute name="id" />
<attribute name="scope" />
<attribute name="pom" />
<sequential>
- <artifact:dependencies pathId="@{scope}.(a){id}.path" filesetId="@{scope}.(a){id}.fileset" versionsId="@{scope}.(a){id}.versions" useScope="@{scope}" sourcesFilesetId="@{scope}.(a){id}.source.fileset">
+ <artifact:dependencies pathId="@{scope}.(a){id}.path" filesetId="@{scope}.(a){id}.fileset" versionsId="@{scope}.(a){id}.versions" useScope="@{scope}" sourcesFilesetId="@{scope}.(a){id}.source.fileset" settingsFile="${maven.dir}/conf/settings.xml">
<pom file="@{pom}" />
</artifact:dependencies>
</sequential>
@@ -144,6 +155,31 @@
</copy>
</sequential>
</macrodef>
+
+ <!-- Copy dependencies from a given pom/scope to a directory, flattening
+ the directory structure and version information -->
+ <macrodef name="copyInlineDependencies">
+ <attribute name="id" />
+ <attribute name="scope" />
+ <element name="inline" implicit="true"/>
+ <attribute name="todir" />
+ <sequential>
+ <inlineDependencies id="@{id}" scope="@{scope}">
+ <inline />
+ </inlineDependencies>
+ <copy todir="@{todir}">
+ <fileset refid="@{scope}.(a){id}.fileset" />
+ <chainedmapper>
+ <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${@{scope}.(a){id}.versions}" to="flatten" />
+ <flattenmapper />
+ <compositemapper>
+ <identitymapper />
+ <globmapper from="mvel.jar" to="mvel14.jar"/>
+ </compositemapper>
+ </chainedmapper>
+ </copy>
+ </sequential>
+ </macrodef>
<macrodef name="maven">
<attribute name="target" />
Modified: trunk/examples/build.xml
===================================================================
--- trunk/examples/build.xml 2008-04-25 14:22:28 UTC (rev 8023)
+++ trunk/examples/build.xml 2008-04-25 14:25:28 UTC (rev 8024)
@@ -301,6 +301,8 @@
<include name="jboss-embedded-api.jar" if="jboss-embedded-api.lib" />
</fileset>
+ <!-- Dependencies for wicket -->
+
<fileset id="wicket-extensions.jar" dir="${lib.dir}">
<include name="wicket-extensions.jar" if="wicket-extensions.lib" />
</fileset>
@@ -310,6 +312,27 @@
<include name="joda-time.jar" if="wicket-datetime.lib" />
</fileset>
+
+ <!-- Dependencies for Trinidad -->
+
+ <fileset id="trinidad-api.jar" dir="${lib.dir}">
+ <include name="trinidad-api.jar" if="trinidad.lib" />
+ </fileset>
+
+ <fileset id="trinidad-impl.jar" dir="${lib.dir}">
+ <include name="trinidad-impl.jar" if="trinidad.lib" />
+ </fileset>
+
+ <!-- Dependencies if el-ri is needed -->
+
+ <fileset id="el-ri.jar" dir="${lib.dir}">
+ <include name="el-ri.jar" if="el-ri.lib" />
+ </fileset>
+
+ <fileset id="jboss-common-core.jar" dir="${lib.dir}">
+ <include name="jboss-common-core.jar" if="jboss-common-core.lib" />
+ </fileset>
+
<!-- ############################ MELDWARE ############################ -->
<!--
Meldware from buni.org provides a java based mail server which Seam uses
@@ -479,7 +502,46 @@
<mkdir dir="${dist.dir}" />
</target>
- <target name="copyextradependencies" />
+ <target name="copyextradependencies" depends="gettrinidad, getelri, getjbosscommoncore"/>
+
+ <target name="gettrinidad" if="trinidad.lib">
+ <copyInlineDependencies id="trinidad" scope="runtime" todir="${lib.dir}">
+ <dependency groupId="org.apache.myfaces.trinidad" artifactId="trinidad-api" version="1.2.5">
+ <exclusion groupId="org.apache.myfaces.trinidad" artifactId="trinidad-build" />
+ <exclusion groupId="javax.servlet" artifactId="servlet-api" />
+ <exclusion groupId="javax.servlet.jsp" artifactId="jsp-api"/>
+ <exclusion groupId="javax.faces" artifactId="jsf-api"/>
+ </dependency>
+ <dependency groupId="org.apache.myfaces.trinidad" artifactId="trinidad-impl" version="1.2.5">
+ <exclusion groupId="org.apache.myfaces.trinidad" artifactId="trinidad-build" />
+ <exclusion groupId="javax.servlet" artifactId="servlet-api" />
+ <exclusion groupId="javax.servlet.jsp" artifactId="jsp-api"/>
+ <exclusion groupId="portlet-api" artifactId="portlet-api"/>
+ <exclusion groupId="jstl" artifactId="jstl"/>
+ <exclusion groupId="commons-beanutils" artifactId="commons-beanutils"/>
+ <exclusion groupId="javax.faces" artifactId="jsf-api"/>
+ <exclusion groupId="com.sun.facelets" artifactId="jsf-facelets"/>
+ </dependency>
+ </copyInlineDependencies>
+ </target>
+
+ <target name="getelri" if="el-ri.lib">
+ <copyInlineDependencies id="elri" scope="runtime" todir="${lib.dir}">
+ <dependency groupId="javax.el" artifactId="el-ri" version="1.2" />
+ </copyInlineDependencies>
+ </target>
+
+ <target name="getjbosscommoncore" if="jboss-common-core.lib">
+ <copyInlineDependencies id="jbosscommoncore" scope="runtime" todir="${lib.dir}">
+ <dependency groupId="jboss" artifactId="jboss-common-core" version="2.0.2.GA">
+ <exclusion groupId="apache-xerces" artifactId="xml-apis" />
+ <exclusion groupId="apache-httpclient" artifactId="commons-httpclient" />
+ <exclusion groupId="oswego-concurrent" artifactId="concurrent" />
+ <exclusion groupId="apache-slide" artifactId="webdavlib" />
+ <exclusion groupId="jboss" artifactId="jboss-logging-spi" />
+ </dependency>
+ </copyInlineDependencies>
+ </target>
<!-- Use the Eclipse compiler, if it is available -->
<target name="select-compiler">
@@ -523,6 +585,8 @@
<fileset refid="facelets.jar" />
<fileset refid="urlrewrite.jar" />
<fileset refid="richfaces-impl.jar" />
+ <fileset refid="trinidad-impl.jar" />
+ <fileset refid="jboss-common-core.jar" />
<fileset refid="war.lib.extras" />
<mapper type="flatten" />
</copy>
@@ -588,7 +652,10 @@
<fileset refid="wicket-extensions.jar" />
<fileset refid="wicket-datetime.jar" />
<fileset refid="seam.wicket.jar" />
- <fileset refid="seam.remoting.jar" />
+ <fileset refid="seam.remoting.jar" />
+ <fileset refid="el-ri.jar" />
+ <fileset refid="trinidad-api.jar" />
+ <fileset refid="jboss-common-core.jar" />
<mapper type="flatten" />
</copy>
</target>
@@ -780,6 +847,8 @@
<fileset refid="wicket-extensions.jar" />
<fileset refid="wicket-datetime.jar" />
<fileset refid="seam.wicket.jar" />
+ <fileset refid="trinidad-api.jar" />
+ <fileset refid="el-ri.jar"/>
<mapper type="flatten" />
</copy>
<copy todir="${war.dir}">
Modified: trunk/examples/hibernate/build-glassfish.xml
===================================================================
--- trunk/examples/hibernate/build-glassfish.xml 2008-04-25 14:22:28 UTC (rev 8023)
+++ trunk/examples/hibernate/build-glassfish.xml 2008-04-25 14:25:28 UTC (rev 8024)
@@ -16,6 +16,7 @@
<property name="seam.debug.lib" value="true"/>
<property name="facelets.lib" value="true"/>
<property name="richfaces.lib" value="true"/>
+ <property name="jboss-common-core.lib" value="true" />
<import file="../build.xml"/>
@@ -30,7 +31,7 @@
<include name="lib/hibernate-annotations.jar"/>
<include name="lib/hibernate-entitymanager.jar"/>
<include name="lib/hibernate-validator.jar"/>
- <include name="examples/jpa/lib/jboss-archive-browsing.jar" />
+
<include name="lib/asm.jar" />
<include name="lib/jboss-common-core.jar" />
<include name="lib/cglib.jar"/>
Modified: trunk/examples/hibernate/build-jboss405.xml
===================================================================
--- trunk/examples/hibernate/build-jboss405.xml 2008-04-25 14:22:28 UTC (rev 8023)
+++ trunk/examples/hibernate/build-jboss405.xml 2008-04-25 14:25:28 UTC (rev 8024)
@@ -15,7 +15,8 @@
<property name="seam.ui.lib" value="true"/>
<property name="seam.debug.lib" value="true"/>
<property name="facelets.lib" value="true"/>
- <property name="richfaces.lib" value="true"/>
+ <property name="richfaces.lib" value="true"/>
+ <property name="el-ri.lib" value="true"/>
<import file="../build.xml"/>
@@ -29,7 +30,6 @@
<include name="lib/jsf-impl.jar"/>
<include name="lib/jstl.jar"/>
<include name="lib/el-api.jar"/>
- <include name="examples/jpa/lib/el-ri.jar" />
</fileset>
</project>
Modified: trunk/examples/hibernate/build-tomcat55.xml
===================================================================
--- trunk/examples/hibernate/build-tomcat55.xml 2008-04-25 14:22:28 UTC (rev 8023)
+++ trunk/examples/hibernate/build-tomcat55.xml 2008-04-25 14:25:28 UTC (rev 8024)
@@ -15,7 +15,8 @@
<property name="seam.ui.lib" value="true"/>
<property name="seam.debug.lib" value="true"/>
<property name="facelets.lib" value="true"/>
- <property name="richfaces.lib" value="true"/>
+ <property name="richfaces.lib" value="true"/>
+ <property name="el-ri.lib" value="true"/>
<import file="../build.xml"/>
@@ -36,7 +37,6 @@
<include name="lib/hibernate-validator.jar"/>
<include name="lib/javassist.jar"/>
<include name="lib/persistence-api.jar" />
- <include name="examples/jpa/lib/el-ri.jar"/>
<include name="lib/el-api.jar" />
<include name="lib/cglib.jar"/>
<include name="lib/jta.jar"/>
Modified: trunk/examples/hibernate/build-weblogic92.xml
===================================================================
--- trunk/examples/hibernate/build-weblogic92.xml 2008-04-25 14:22:28 UTC (rev 8023)
+++ trunk/examples/hibernate/build-weblogic92.xml 2008-04-25 14:25:28 UTC (rev 8024)
@@ -15,7 +15,9 @@
<property name="seam.ui.lib" value="true"/>
<property name="seam.debug.lib" value="true"/>
<property name="facelets.lib" value="true"/>
- <property name="richfaces.lib" value="true"/>
+ <property name="richfaces.lib" value="true"/>
+ <property name="el-ri.lib" value="true"/>
+ <property name="jboss-common-core.lib" value="true" />
<import file="../build.xml"/>
@@ -34,7 +36,6 @@
<include name="lib/jsf-api.jar" />
<include name="lib/jsf-impl.jar" />
<include name="lib/jstl.jar" />
- <include name="examples/jpa/lib/el-ri.jar" />
<include name="lib/el-api.jar" />
<!-- Hibernate and deps -->
@@ -43,7 +44,6 @@
<include name="lib/hibernate-annotations.jar" />
<include name="lib/hibernate-entitymanager.jar" />
<include name="lib/hibernate-validator.jar" />
- <include name="examples/jpa/lib/jboss-archive-browsing.jar" />
<include name="lib/persistence-api.jar" />
<include name="lib/cglib.jar" />
<include name="lib/antlr.jar" />
Modified: trunk/examples/hibernate/build-websphere61.xml
===================================================================
--- trunk/examples/hibernate/build-websphere61.xml 2008-04-25 14:22:28 UTC (rev 8023)
+++ trunk/examples/hibernate/build-websphere61.xml 2008-04-25 14:25:28 UTC (rev 8024)
@@ -12,10 +12,12 @@
<property name="exploded-archives.dir" value="exploded-archives-websphere61" />
<!-- Libraries to include -->
- <property name="seam.ui.lib" value="true" />
+ <property name="seam.ui.lib" value="true" />
<property name="seam.debug.lib" value="true" />
- <property name="facelets.lib" value="true" />
- <property name="richfaces.lib" value="true" />
+ <property name="facelets.lib" value="true" />
+ <property name="richfaces.lib" value="true" />
+ <property name="el-ri.lib" value="true"/>
+ <property name="jboss-common-core.lib" value="true" />
<import file="../build.xml" />
@@ -32,7 +34,6 @@
<include name="lib/jsf-api.jar"/>
<include name="lib/jsf-impl.jar"/>
<include name="lib/jstl.jar"/>
- <include name="examples/jpa/lib/el-ri.jar"/>
<include name="lib/el-api.jar" />
<!-- Hibernate and deps -->
@@ -41,7 +42,6 @@
<include name="lib/hibernate-annotations.jar"/>
<include name="lib/hibernate-entitymanager.jar"/>
<include name="lib/hibernate-validator.jar"/>
- <include name="examples/jpa/lib/jboss-archive-browsing.jar" />
<include name="lib/persistence-api.jar" />
<include name="lib/cglib.jar"/>
<include name="lib/antlr.jar" />
Modified: trunk/examples/jee5/booking/build.xml
===================================================================
--- trunk/examples/jee5/booking/build.xml 2008-04-25 14:22:28 UTC (rev 8023)
+++ trunk/examples/jee5/booking/build.xml 2008-04-25 14:25:28 UTC (rev 8024)
@@ -16,6 +16,7 @@
<property name="seam.debug.lib" value="true"/>
<property name="facelets.lib" value="true"/>
<property name="richfaces.lib" value="true"/>
+ <property name="jboss-common-core.lib" value="true" />
<!-- add libs for oc4j (broken classloading) -->
<!--
<property name="jbpm.lib" value="true"/>
@@ -39,7 +40,6 @@
<include name="lib/hibernate-annotations.jar"/>
<include name="lib/hibernate-entitymanager.jar"/>
<include name="lib/hibernate-validator.jar"/>
- <include name="examples/jpa/lib/jboss-archive-browsing.jar" />
<include name="lib/cglib.jar"/>
<include name="lib/asm.jar"/>
<include name="lib/antlr.jar" />
Modified: trunk/examples/jpa/build-glassfish.xml
===================================================================
--- trunk/examples/jpa/build-glassfish.xml 2008-04-25 14:22:28 UTC (rev 8023)
+++ trunk/examples/jpa/build-glassfish.xml 2008-04-25 14:25:28 UTC (rev 8024)
@@ -16,6 +16,7 @@
<property name="seam.debug.lib" value="true"/>
<property name="facelets.lib" value="true"/>
<property name="richfaces.lib" value="true"/>
+ <property name="jboss-common-core.lib" value="true" />
<import file="../build.xml"/>
@@ -30,7 +31,6 @@
<include name="lib/hibernate-annotations.jar"/>
<include name="lib/hibernate-entitymanager.jar"/>
<include name="lib/hibernate-validator.jar"/>
- <include name="examples/jpa/lib/jboss-archive-browsing.jar" />
<include name="lib/asm.jar" />
<include name="lib/jboss-common-core.jar" />
<include name="lib/cglib.jar"/>
Modified: trunk/examples/jpa/build-jboss405.xml
===================================================================
--- trunk/examples/jpa/build-jboss405.xml 2008-04-25 14:22:28 UTC (rev 8023)
+++ trunk/examples/jpa/build-jboss405.xml 2008-04-25 14:25:28 UTC (rev 8024)
@@ -15,7 +15,8 @@
<property name="seam.ui.lib" value="true"/>
<property name="seam.debug.lib" value="true"/>
<property name="facelets.lib" value="true"/>
- <property name="richfaces.lib" value="true"/>
+ <property name="richfaces.lib" value="true"/>
+ <property name="el-ri.lib" value="true"/>
<import file="../build.xml"/>
@@ -28,7 +29,6 @@
<include name="lib/jsf-impl.jar"/>
<include name="lib/jsf-api.jar"/>
<include name="lib/jstl.jar"/>
- <include name="examples/jpa/lib/el-ri.jar"/>
<include name="lib/el-api.jar"/>
</fileset>
Modified: trunk/examples/jpa/build-tomcat55.xml
===================================================================
--- trunk/examples/jpa/build-tomcat55.xml 2008-04-25 14:22:28 UTC (rev 8023)
+++ trunk/examples/jpa/build-tomcat55.xml 2008-04-25 14:25:28 UTC (rev 8024)
@@ -15,7 +15,9 @@
<property name="seam.ui.lib" value="true"/>
<property name="seam.debug.lib" value="true"/>
<property name="facelets.lib" value="true"/>
- <property name="richfaces.lib" value="true"/>
+ <property name="richfaces.lib" value="true"/>
+ <property name="el-ri.lib" value="true"/>
+ <property name="jboss-common-core.lib" value="true" />
<import file="../build.xml"/>
@@ -36,7 +38,6 @@
<include name="lib/jsf-api.jar"/>
<include name="lib/jsf-impl.jar"/>
<include name="lib/jstl.jar"/>
- <include name="examples/jpa/lib/el-ri.jar"/>
<include name="lib/el-api.jar" />
<!-- Hibernate and deps -->
@@ -45,7 +46,6 @@
<include name="lib/hibernate-annotations.jar"/>
<include name="lib/hibernate-entitymanager.jar"/>
<include name="lib/hibernate-validator.jar"/>
- <include name="examples/jpa/lib/jboss-archive-browsing.jar" />
<include name="lib/persistence-api.jar" />
<include name="lib/asm.jar" />
<include name="lib/cglib.jar"/>
Modified: trunk/examples/jpa/build-tomcat6.xml
===================================================================
--- trunk/examples/jpa/build-tomcat6.xml 2008-04-25 14:22:28 UTC (rev 8023)
+++ trunk/examples/jpa/build-tomcat6.xml 2008-04-25 14:25:28 UTC (rev 8024)
@@ -16,6 +16,7 @@
<property name="seam.debug.lib" value="true"/>
<property name="facelets.lib" value="true"/>
<property name="richfaces.lib" value="true"/>
+ <property name="jboss-common-core.lib" value="true" />
<import file="../build.xml"/>
@@ -40,7 +41,6 @@
<include name="lib/jta.jar" />
<include name="lib/antlr.jar" />
<include name="lib/asm.jar" />
- <include name="examples/jpa/lib/jboss-archive-browsing.jar" />
</fileset>
<fileset id="noejb.war.extras" dir="${resources.dir}">
Modified: trunk/examples/jpa/build-weblogic10.xml
===================================================================
--- trunk/examples/jpa/build-weblogic10.xml 2008-04-25 14:22:28 UTC (rev 8023)
+++ trunk/examples/jpa/build-weblogic10.xml 2008-04-25 14:25:28 UTC (rev 8024)
@@ -13,10 +13,12 @@
value="exploded-archives-weblogic10" />
<!-- Libraries to include -->
- <property name="seam.ui.lib" value="true" />
+ <property name="seam.ui.lib" value="true" />
<property name="seam.debug.lib" value="true" />
- <property name="facelets.lib" value="true" />
- <property name="richfaces.lib" value="true" />
+ <property name="facelets.lib" value="true" />
+ <property name="richfaces.lib" value="true" />
+ <property name="el-ri.lib" value="true"/>
+ <property name="jboss-common-core.lib" value="true" />
<import file="../build.xml" />
@@ -33,7 +35,6 @@
<!-- JSF (and related) implementation -->
<include name="lib/jsf-api.jar" />
<include name="lib/jsf-impl.jar" />
- <include name="examples/jpa/lib/el-ri.jar" />
<!-- Hibernate and deps -->
<include name="lib/hibernate.jar" />
@@ -41,7 +42,6 @@
<include name="lib/hibernate-annotations.jar" />
<include name="lib/hibernate-entitymanager.jar" />
<include name="lib/hibernate-validator.jar" />
- <include name="examples/jpa/lib/jboss-archive-browsing.jar" />
<include name="lib/cglib.jar" />
<include name="lib/asm.jar"/>
<include name="lib/antlr.jar" />
Modified: trunk/examples/jpa/build-weblogic92.xml
===================================================================
--- trunk/examples/jpa/build-weblogic92.xml 2008-04-25 14:22:28 UTC (rev 8023)
+++ trunk/examples/jpa/build-weblogic92.xml 2008-04-25 14:25:28 UTC (rev 8024)
@@ -13,10 +13,12 @@
value="exploded-archives-weblogic92" />
<!-- Libraries to include -->
- <property name="seam.ui.lib" value="true" />
+ <property name="seam.ui.lib" value="true" />
<property name="seam.debug.lib" value="true" />
- <property name="facelets.lib" value="true" />
- <property name="richfaces.lib" value="true" />
+ <property name="facelets.lib" value="true" />
+ <property name="richfaces.lib" value="true" />
+ <property name="el-ri.lib" value="true"/>
+ <property name="jboss-common-core.lib" value="true" />
<import file="../build.xml" />
@@ -36,7 +38,6 @@
<include name="lib/jsf-api.jar" />
<include name="lib/jsf-impl.jar" />
<include name="lib/jstl.jar" />
- <include name="examples/jpa/lib/el-ri.jar" />
<include name="lib/el-api.jar" />
<!-- Hibernate and deps -->
@@ -45,7 +46,6 @@
<include name="lib/hibernate-annotations.jar" />
<include name="lib/hibernate-entitymanager.jar" />
<include name="lib/hibernate-validator.jar" />
- <include name="examples/jpa/lib/jboss-archive-browsing.jar" />
<include name="lib/persistence-api.jar" />
<include name="lib/cglib.jar" />
<include name="lib/antlr.jar" />
Modified: trunk/examples/jpa/build-websphere61.xml
===================================================================
--- trunk/examples/jpa/build-websphere61.xml 2008-04-25 14:22:28 UTC (rev 8023)
+++ trunk/examples/jpa/build-websphere61.xml 2008-04-25 14:25:28 UTC (rev 8024)
@@ -15,7 +15,9 @@
<property name="seam.ui.lib" value="true"/>
<property name="seam.debug.lib" value="true"/>
<property name="facelets.lib" value="true"/>
- <property name="richfaces.lib" value="true"/>
+ <property name="richfaces.lib" value="true"/>
+ <property name="el-ri.lib" value="true"/>
+ <property name="jboss-common-core.lib" value="true" />
<import file="../build.xml"/>
@@ -31,7 +33,6 @@
<!-- JSF (and related) implementation -->
<include name="lib/jsf-api.jar"/>
<include name="lib/jsf-impl.jar"/>
- <include name="examples/jpa/lib/el-ri.jar"/>
<include name="lib/el-api.jar" />
<!-- Hibernate and deps -->
@@ -40,7 +41,6 @@
<include name="lib/hibernate-annotations.jar"/>
<include name="lib/hibernate-entitymanager.jar"/>
<include name="lib/hibernate-validator.jar"/>
- <include name="examples/jpa/lib/jboss-archive-browsing.jar" />
<include name="lib/cglib.jar"/>
<include name="lib/asm.jar"/>
<include name="lib/antlr.jar" />
Modified: trunk/examples/seamdiscs/build.xml
===================================================================
--- trunk/examples/seamdiscs/build.xml 2008-04-25 14:22:28 UTC (rev 8023)
+++ trunk/examples/seamdiscs/build.xml 2008-04-25 14:25:28 UTC (rev 8024)
@@ -10,59 +10,20 @@
<property name="seam.ui.lib" value="yes"/>
<property name="seam.debug.lib" value="yes"/>
<property name="facelets.lib" value="yes"/>
- <property name="richfaces.lib" value="yes"/>
+ <property name="richfaces.lib" value="yes"/>
+ <property name="trinidad.lib" value="yes"/>
<import file="../build.xml"/>
<property name="example.tmp.lib.dir" value="${basedir}/lib" />
- <fileset id="ear.lib.extras" dir="${example.tmp.lib.dir}">
- <include name="trinidad-api.jar"/>
- </fileset>
-
- <fileset id="war.lib.extras" dir="${example.tmp.lib.dir}">
- <include name="trinidad-impl.jar"/>
- </fileset>
-
<fileset id="war.extras" dir="${resources.dir}">
<include name="WEB-INF/lib/*.jar"/>
</fileset>
- <path id="build.classpath.extras">
- <fileset dir="${example.tmp.lib.dir}">
- <include name="trinidad-api.jar"/>
- </fileset>
- </path>
-
<patternset id="test.resources.files">
<exclude name="import.sql" />
</patternset>
-
- <target name="copyextradependencies">
-
- <artifact:dependencies filesetId="trinidad.fileset" versionsId="trinidad.versions" sourcesfilesetid="trinidad.sources">
- <dependency groupId="org.apache.myfaces.trinidad" artifactId="trinidad-api" version="1.2.5">
- <exclusion groupId="org.apache.myfaces.trinidad" artifactId="trinidad-build" />
- <exclusion groupId="javax.servlet" artifactId="servlet-api" />
- <exclusion groupId="javax.servlet.jsp" artifactId="jsp-api"/>
- <exclusion groupId="javax.faces" artifactId="jsf-api"/>
- </dependency>
- <dependency groupId="org.apache.myfaces.trinidad" artifactId="trinidad-impl" version="1.2.5">
- <exclusion groupId="org.apache.myfaces.trinidad" artifactId="trinidad-build" />
- <exclusion groupId="javax.servlet" artifactId="servlet-api" />
- <exclusion groupId="javax.servlet.jsp" artifactId="jsp-api"/>
- <exclusion groupId="portlet-api" artifactId="portlet-api"/>
- <exclusion groupId="jstl" artifactId="jstl"/>
- <exclusion groupId="commons-beanutils" artifactId="commons-beanutils"/>
- <exclusion groupId="javax.faces" artifactId="jsf-api"/>
- <exclusion groupId="com.sun.facelets" artifactId="jsf-facelets"/>
- </dependency>
- </artifact:dependencies>
- <copy todir="${example.tmp.lib.dir}">
- <fileset refid="trinidad.fileset" />
- <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${trinidad.versions}" to="flatten" />
- </copy>
- </target>
</project>
16 years, 1 month
- 1
- 0
Seam SVN: r8023 - trunk/build.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-04-25 10:22:28 -0400 (Fri, 25 Apr 2008)
New Revision: 8023
Modified:
trunk/build/root.pom.xml
Log:
Upgrade HEM, HAN, Wicket extensions, HSEARCH
Modified: trunk/build/root.pom.xml
===================================================================
--- trunk/build/root.pom.xml 2008-04-25 12:50:52 UTC (rev 8022)
+++ trunk/build/root.pom.xml 2008-04-25 14:22:28 UTC (rev 8023)
@@ -267,24 +267,36 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-annotations</artifactId>
- <version>3.3.0.ga</version>
+ <version>3.3.1.GA</version>
<exclusions>
<exclusion>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>ejb3-persistence</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-entitymanager</artifactId>
- <version>3.3.1.ga</version>
+ <version>3.3.2.GA</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>ejb3-persistence</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -303,7 +315,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-search</artifactId>
- <version>3.0.0.GA</version>
+ <version>3.0.1.GA</version>
</dependency>
<dependency>
@@ -606,6 +618,10 @@
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -918,7 +934,7 @@
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-extensions</artifactId>
- <version>1.3.0</version>
+ <version>${version.wicket}</version>
<exclusions>
<exclusion>
<groupId>cglib</groupId>
@@ -944,7 +960,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.0.1</version>
+ <version>1.4.2</version>
</dependency>
</dependencies>
16 years, 1 month
- 1
- 0
Seam SVN: r8022 - in branches/Seam_2_0: src/main/org/jboss/seam/framework and 1 other directories.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-04-25 08:50:52 -0400 (Fri, 25 Apr 2008)
New Revision: 8022
Modified:
branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Framework.xml
branches/Seam_2_0/src/main/org/jboss/seam/framework/EntityController.java
branches/Seam_2_0/src/main/org/jboss/seam/framework/EntityHome.java
branches/Seam_2_0/src/main/org/jboss/seam/framework/EntityQuery.java
branches/Seam_2_0/src/main/org/jboss/seam/framework/HibernateEntityController.java
branches/Seam_2_0/src/main/org/jboss/seam/framework/HibernateEntityHome.java
branches/Seam_2_0/src/main/org/jboss/seam/framework/HibernateEntityQuery.java
branches/Seam_2_0/src/main/org/jboss/seam/framework/MutableEntityController.java
branches/Seam_2_0/src/main/org/jboss/seam/framework/PersistenceController.java
branches/Seam_2_0/ui/src/main/java/org/jboss/seam/ui/converter/entityConverter/EntityLoader.java
branches/Seam_2_0/ui/src/main/java/org/jboss/seam/ui/converter/entityConverter/HibernateEntityLoader.java
Log:
JBSEAM-2913
Modified: branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Framework.xml
===================================================================
--- branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Framework.xml 2008-04-25 12:47:09 UTC (rev 8021)
+++ branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Framework.xml 2008-04-25 12:50:52 UTC (rev 8022)
@@ -55,15 +55,16 @@
your taste, you can use extension instead:
</para>
- <programlisting role="JAVA"><![CDATA[@Stateful
+ <programlisting role="JAVA"><![CDATA[
@Name("personHome")
-public class PersonHome extends EntityHome<Person> implements LocalPersonHome {
- @RequestParameter String personId;
- @In EntityManager personDatabase;
+public class PersonHome extends EntityHome<Person> {
- public Object getId() { return personId; }
- public EntityManager getEntityManager() { return personDatabase; }
+ @In EntityManager personDatabase;
+ public EntityManager getEntityManager() {
+ return personDatabase;
+ }
+
}]]></programlisting>
<para>
@@ -77,10 +78,35 @@
A second advantage is that your classes may be EJB stateful
session beans, if you like. (They do not have to be, they
can be plain JavaBean components if you prefer.) If you are using
- JBoss AS, you'll need 4.2.2.GA or later.
+ JBoss AS, you'll need 4.2.2.GA or later:
</para>
+ <programlisting role="JAVA"><![CDATA[@Stateful
+@Name("personHome")
+public class PersonHome extends EntityHome<Person> implements LocalPersonHome {
+
+}]]></programlisting>
+
<para>
+ You can also make your classes stateless session beans. In this case
+ you <emphasis>must</emphasis> use injection to provide the
+ persistence context, even if it is called
+ <literal>entityManager</literal>:
+ </para>
+
+ <programlisting role="JAVA"><![CDATA[@Stateless
+@Name("personHome")
+public class PersonHome extends EntityHome<Person> implements LocalPersonHome {
+
+ @In EntityManager entityManager;
+
+ public EntityManager getPersistenceContext() {
+ entityManager;
+ }
+
+}]]></programlisting>
+
+ <para>
At this time, the Seam Application Framework provides four main
built-in components: <literal>EntityHome</literal> and
<literal>HibernateEntityHome</literal> for CRUD, along with
Modified: branches/Seam_2_0/src/main/org/jboss/seam/framework/EntityController.java
===================================================================
--- branches/Seam_2_0/src/main/org/jboss/seam/framework/EntityController.java 2008-04-25 12:47:09 UTC (rev 8021)
+++ branches/Seam_2_0/src/main/org/jboss/seam/framework/EntityController.java 2008-04-25 12:50:52 UTC (rev 8022)
@@ -82,10 +82,4 @@
getEntityManager().remove(entity);
}
- @Override
- protected boolean isPersistenceContextOpen(EntityManager persistenceContext)
- {
- return persistenceContext.isOpen();
- }
-
}
Modified: branches/Seam_2_0/src/main/org/jboss/seam/framework/EntityHome.java
===================================================================
--- branches/Seam_2_0/src/main/org/jboss/seam/framework/EntityHome.java 2008-04-25 12:47:09 UTC (rev 8021)
+++ branches/Seam_2_0/src/main/org/jboss/seam/framework/EntityHome.java 2008-04-25 12:50:52 UTC (rev 8022)
@@ -216,10 +216,4 @@
}
}
- @Override
- protected boolean isPersistenceContextOpen(EntityManager persistenceContext)
- {
- return persistenceContext.isOpen();
- }
-
}
Modified: branches/Seam_2_0/src/main/org/jboss/seam/framework/EntityQuery.java
===================================================================
--- branches/Seam_2_0/src/main/org/jboss/seam/framework/EntityQuery.java 2008-04-25 12:47:09 UTC (rev 8021)
+++ branches/Seam_2_0/src/main/org/jboss/seam/framework/EntityQuery.java 2008-04-25 12:50:52 UTC (rev 8022)
@@ -234,11 +234,5 @@
throw new RuntimeException("could not join transaction", se);
}
}
-
- @Override
- protected boolean isPersistenceContextOpen(EntityManager persistenceContext)
- {
- return persistenceContext.isOpen();
- }
}
Modified: branches/Seam_2_0/src/main/org/jboss/seam/framework/HibernateEntityController.java
===================================================================
--- branches/Seam_2_0/src/main/org/jboss/seam/framework/HibernateEntityController.java 2008-04-25 12:47:09 UTC (rev 8021)
+++ branches/Seam_2_0/src/main/org/jboss/seam/framework/HibernateEntityController.java 2008-04-25 12:50:52 UTC (rev 8022)
@@ -117,11 +117,5 @@
{
getSession().refresh(entity);
}
-
- @Override
- protected boolean isPersistenceContextOpen(Session persistenceContext)
- {
- return persistenceContext.isOpen();
- }
}
Modified: branches/Seam_2_0/src/main/org/jboss/seam/framework/HibernateEntityHome.java
===================================================================
--- branches/Seam_2_0/src/main/org/jboss/seam/framework/HibernateEntityHome.java 2008-04-25 12:47:09 UTC (rev 8021)
+++ branches/Seam_2_0/src/main/org/jboss/seam/framework/HibernateEntityHome.java 2008-04-25 12:50:52 UTC (rev 8022)
@@ -119,10 +119,4 @@
}
}
- @Override
- protected boolean isPersistenceContextOpen(Session persistenceContext)
- {
- return persistenceContext.isOpen();
- }
-
}
Modified: branches/Seam_2_0/src/main/org/jboss/seam/framework/HibernateEntityQuery.java
===================================================================
--- branches/Seam_2_0/src/main/org/jboss/seam/framework/HibernateEntityQuery.java 2008-04-25 12:47:09 UTC (rev 8021)
+++ branches/Seam_2_0/src/main/org/jboss/seam/framework/HibernateEntityQuery.java 2008-04-25 12:50:52 UTC (rev 8022)
@@ -201,11 +201,5 @@
{
this.fetchSize = fetchSize;
}
-
- @Override
- protected boolean isPersistenceContextOpen(Session persistenceContext)
- {
- return persistenceContext.isOpen();
- }
}
Modified: branches/Seam_2_0/src/main/org/jboss/seam/framework/MutableEntityController.java
===================================================================
--- branches/Seam_2_0/src/main/org/jboss/seam/framework/MutableEntityController.java 2008-04-25 12:47:09 UTC (rev 8021)
+++ branches/Seam_2_0/src/main/org/jboss/seam/framework/MutableEntityController.java 2008-04-25 12:50:52 UTC (rev 8022)
@@ -82,10 +82,4 @@
getEntityManager().remove(entity);
}
- @Override
- protected boolean isPersistenceContextOpen(EntityManager persistenceContext)
- {
- return persistenceContext.isOpen();
- }
-
}
Modified: branches/Seam_2_0/src/main/org/jboss/seam/framework/PersistenceController.java
===================================================================
--- branches/Seam_2_0/src/main/org/jboss/seam/framework/PersistenceController.java 2008-04-25 12:47:09 UTC (rev 8021)
+++ branches/Seam_2_0/src/main/org/jboss/seam/framework/PersistenceController.java 2008-04-25 12:50:52 UTC (rev 8022)
@@ -15,7 +15,7 @@
public T getPersistenceContext()
{
- if (persistenceContext==null || !isPersistenceContextOpen(persistenceContext))
+ if (persistenceContext==null)
{
persistenceContext = (T) getComponentInstance( getPersistenceContextName() );
}
@@ -28,10 +28,5 @@
}
protected abstract String getPersistenceContextName();
-
- protected boolean isPersistenceContextOpen(T persistenceContext)
- {
- return true;
- }
}
Modified: branches/Seam_2_0/ui/src/main/java/org/jboss/seam/ui/converter/entityConverter/EntityLoader.java
===================================================================
--- branches/Seam_2_0/ui/src/main/java/org/jboss/seam/ui/converter/entityConverter/EntityLoader.java 2008-04-25 12:47:09 UTC (rev 8021)
+++ branches/Seam_2_0/ui/src/main/java/org/jboss/seam/ui/converter/entityConverter/EntityLoader.java 2008-04-25 12:50:52 UTC (rev 8022)
@@ -50,10 +50,5 @@
{
return (EntityLoader) Component.getInstance(EntityLoader.class, STATELESS);
}
-
- @Override
- protected boolean isPersistenceContextOpen(EntityManager persistenceContext)
- {
- return persistenceContext.isOpen();
- }
+
}
Modified: branches/Seam_2_0/ui/src/main/java/org/jboss/seam/ui/converter/entityConverter/HibernateEntityLoader.java
===================================================================
--- branches/Seam_2_0/ui/src/main/java/org/jboss/seam/ui/converter/entityConverter/HibernateEntityLoader.java 2008-04-25 12:47:09 UTC (rev 8021)
+++ branches/Seam_2_0/ui/src/main/java/org/jboss/seam/ui/converter/entityConverter/HibernateEntityLoader.java 2008-04-25 12:50:52 UTC (rev 8022)
@@ -50,10 +50,4 @@
return (HibernateEntityLoader) Component.getInstance(HibernateEntityLoader.class, STATELESS);
}
- @Override
- protected boolean isPersistenceContextOpen(Session persistenceContext)
- {
- return persistenceContext.isOpen();
- }
-
}
16 years, 1 month
- 1
- 0
Seam SVN: r8021 - in trunk: src/main/org/jboss/seam/framework and 1 other directory.
by seam-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2008-04-25 08:47:09 -0400 (Fri, 25 Apr 2008)
New Revision: 8021
Modified:
trunk/doc/reference/en/modules/framework.xml
trunk/src/main/org/jboss/seam/framework/EntityController.java
trunk/src/main/org/jboss/seam/framework/EntityHome.java
trunk/src/main/org/jboss/seam/framework/EntityQuery.java
trunk/src/main/org/jboss/seam/framework/HibernateEntityController.java
trunk/src/main/org/jboss/seam/framework/HibernateEntityHome.java
trunk/src/main/org/jboss/seam/framework/HibernateEntityQuery.java
trunk/src/main/org/jboss/seam/framework/MutableEntityController.java
trunk/src/main/org/jboss/seam/framework/PersistenceController.java
Log:
JBSEAM-2913
Modified: trunk/doc/reference/en/modules/framework.xml
===================================================================
--- trunk/doc/reference/en/modules/framework.xml 2008-04-25 07:34:46 UTC (rev 8020)
+++ trunk/doc/reference/en/modules/framework.xml 2008-04-25 12:47:09 UTC (rev 8021)
@@ -51,15 +51,15 @@
your taste, you can use extension instead:
</para>
- <programlisting><![CDATA[@Stateful
-@Name("personHome")
-public class PersonHome extends EntityHome<Person> implements LocalPersonHome {
- @RequestParameter String personId;
- @In EntityManager personDatabase;
+ <programlisting><![CDATA[@Name("personHome")
+public class PersonHome extends EntityHome<Person> {
- public Object getId() { return personId; }
- public EntityManager getEntityManager() { return personDatabase; }
+ @In EntityManager personDatabase;
+ public EntityManager getEntityManager() {
+ return personDatabase;
+ }
+
}]]></programlisting>
<para>
@@ -73,10 +73,35 @@
A second advantage is that your classes may be EJB stateful
session beans, if you like. (They do not have to be, they
can be plain JavaBean components if you prefer.) If you are using
- JBoss AS, you'll need 4.2.2.GA or later.
+ JBoss AS, you'll need 4.2.2.GA or later:
</para>
+ <programlisting role="JAVA"><![CDATA[@Stateful
+@Name("personHome")
+public class PersonHome extends EntityHome<Person> implements LocalPersonHome {
+
+}]]></programlisting>
+
<para>
+ You can also make your classes stateless session beans. In this case
+ you <emphasis>must</emphasis> use injection to provide the
+ persistence context, even if it is called
+ <literal>entityManager</literal>:
+ </para>
+
+ <programlisting role="JAVA"><![CDATA[@Stateless
+@Name("personHome")
+public class PersonHome extends EntityHome<Person> implements LocalPersonHome {
+
+ @In EntityManager entityManager;
+
+ public EntityManager getPersistenceContext() {
+ entityManager;
+ }
+
+}]]></programlisting>
+
+ <para>
At this time, the Seam Application Framework provides four main
built-in components: <literal>EntityHome</literal> and
<literal>HibernateEntityHome</literal> for CRUD, along with
Modified: trunk/src/main/org/jboss/seam/framework/EntityController.java
===================================================================
--- trunk/src/main/org/jboss/seam/framework/EntityController.java 2008-04-25 07:34:46 UTC (rev 8020)
+++ trunk/src/main/org/jboss/seam/framework/EntityController.java 2008-04-25 12:47:09 UTC (rev 8021)
@@ -82,10 +82,4 @@
getEntityManager().remove(entity);
}
- @Override
- protected boolean isPersistenceContextOpen(EntityManager persistenceContext)
- {
- return persistenceContext.isOpen();
- }
-
}
Modified: trunk/src/main/org/jboss/seam/framework/EntityHome.java
===================================================================
--- trunk/src/main/org/jboss/seam/framework/EntityHome.java 2008-04-25 07:34:46 UTC (rev 8020)
+++ trunk/src/main/org/jboss/seam/framework/EntityHome.java 2008-04-25 12:47:09 UTC (rev 8021)
@@ -216,10 +216,4 @@
}
}
- @Override
- protected boolean isPersistenceContextOpen(EntityManager persistenceContext)
- {
- return persistenceContext.isOpen();
- }
-
}
Modified: trunk/src/main/org/jboss/seam/framework/EntityQuery.java
===================================================================
--- trunk/src/main/org/jboss/seam/framework/EntityQuery.java 2008-04-25 07:34:46 UTC (rev 8020)
+++ trunk/src/main/org/jboss/seam/framework/EntityQuery.java 2008-04-25 12:47:09 UTC (rev 8021)
@@ -234,11 +234,5 @@
throw new RuntimeException("could not join transaction", se);
}
}
-
- @Override
- protected boolean isPersistenceContextOpen(EntityManager persistenceContext)
- {
- return persistenceContext.isOpen();
- }
}
Modified: trunk/src/main/org/jboss/seam/framework/HibernateEntityController.java
===================================================================
--- trunk/src/main/org/jboss/seam/framework/HibernateEntityController.java 2008-04-25 07:34:46 UTC (rev 8020)
+++ trunk/src/main/org/jboss/seam/framework/HibernateEntityController.java 2008-04-25 12:47:09 UTC (rev 8021)
@@ -117,11 +117,5 @@
{
getSession().refresh(entity);
}
-
- @Override
- protected boolean isPersistenceContextOpen(Session persistenceContext)
- {
- return persistenceContext.isOpen();
- }
}
Modified: trunk/src/main/org/jboss/seam/framework/HibernateEntityHome.java
===================================================================
--- trunk/src/main/org/jboss/seam/framework/HibernateEntityHome.java 2008-04-25 07:34:46 UTC (rev 8020)
+++ trunk/src/main/org/jboss/seam/framework/HibernateEntityHome.java 2008-04-25 12:47:09 UTC (rev 8021)
@@ -119,10 +119,4 @@
}
}
- @Override
- protected boolean isPersistenceContextOpen(Session persistenceContext)
- {
- return persistenceContext.isOpen();
- }
-
}
Modified: trunk/src/main/org/jboss/seam/framework/HibernateEntityQuery.java
===================================================================
--- trunk/src/main/org/jboss/seam/framework/HibernateEntityQuery.java 2008-04-25 07:34:46 UTC (rev 8020)
+++ trunk/src/main/org/jboss/seam/framework/HibernateEntityQuery.java 2008-04-25 12:47:09 UTC (rev 8021)
@@ -201,11 +201,5 @@
{
this.fetchSize = fetchSize;
}
-
- @Override
- protected boolean isPersistenceContextOpen(Session persistenceContext)
- {
- return persistenceContext.isOpen();
- }
}
Modified: trunk/src/main/org/jboss/seam/framework/MutableEntityController.java
===================================================================
--- trunk/src/main/org/jboss/seam/framework/MutableEntityController.java 2008-04-25 07:34:46 UTC (rev 8020)
+++ trunk/src/main/org/jboss/seam/framework/MutableEntityController.java 2008-04-25 12:47:09 UTC (rev 8021)
@@ -82,10 +82,4 @@
getEntityManager().remove(entity);
}
- @Override
- protected boolean isPersistenceContextOpen(EntityManager persistenceContext)
- {
- return persistenceContext.isOpen();
- }
-
}
Modified: trunk/src/main/org/jboss/seam/framework/PersistenceController.java
===================================================================
--- trunk/src/main/org/jboss/seam/framework/PersistenceController.java 2008-04-25 07:34:46 UTC (rev 8020)
+++ trunk/src/main/org/jboss/seam/framework/PersistenceController.java 2008-04-25 12:47:09 UTC (rev 8021)
@@ -15,7 +15,7 @@
public T getPersistenceContext()
{
- if (persistenceContext==null || !isPersistenceContextOpen(persistenceContext))
+ if (persistenceContext==null)
{
persistenceContext = (T) getComponentInstance( getPersistenceContextName() );
}
@@ -28,10 +28,5 @@
}
protected abstract String getPersistenceContextName();
-
- protected boolean isPersistenceContextOpen(T persistenceContext)
- {
- return true;
- }
}
16 years, 1 month
- 1
- 0
Seam SVN: r8020 - branches/Seam_2_0.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-04-25 03:34:46 -0400 (Fri, 25 Apr 2008)
New Revision: 8020
Modified:
branches/Seam_2_0/release-process.txt
Log:
fix foreign key in table create statement
Modified: branches/Seam_2_0/release-process.txt
===================================================================
--- branches/Seam_2_0/release-process.txt 2008-04-24 22:14:56 UTC (rev 8019)
+++ branches/Seam_2_0/release-process.txt 2008-04-25 07:34:46 UTC (rev 8020)
@@ -244,7 +244,7 @@
`birthdate` date default NULL,
`address` varchar(600) NOT NULL,
PRIMARY KEY (`username`)
-) ENGINE=InnoDB
+) ENGINE=InnoDB;
CREATE TABLE `Vehicle` (
`ownerUsername` varchar(10) default NULL,
@@ -255,8 +255,8 @@
`state` varchar(2) NOT NULL,
PRIMARY KEY USING BTREE (`registration`,`state`),
KEY `ownerUsername` (`ownerUsername`),
- CONSTRAINT `owner` FOREIGN KEY (`ownerUsername`) REFERENCES `person` (`username`)
-) ENGINE=InnoDB
+ CONSTRAINT `owner` FOREIGN KEY (`ownerUsername`) REFERENCES `Person` (`username`)
+) ENGINE=InnoDB;
* seam-gen review seam-gen chapter of the reference guide
- accurate and up to date
16 years, 1 month
- 1
- 0
Seam SVN: r8019 - trunk/build.
by seam-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2008-04-24 18:14:56 -0400 (Thu, 24 Apr 2008)
New Revision: 8019
Modified:
trunk/build/root.pom.xml
Log:
change wicket-extensions version to 1.3.0 from 1.3.0-SNAPSHOT to fix failing build
Modified: trunk/build/root.pom.xml
===================================================================
--- trunk/build/root.pom.xml 2008-04-24 12:27:32 UTC (rev 8018)
+++ trunk/build/root.pom.xml 2008-04-24 22:14:56 UTC (rev 8019)
@@ -918,7 +918,7 @@
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-extensions</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.0</version>
<exclusions>
<exclusion>
<groupId>cglib</groupId>
16 years, 1 month
- 1
- 0