geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From de...@apache.org
Subject svn commit: r897768 - in /geronimo/samples/branches/2.2/samples: DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/ DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/beans/ DataCDInfo/DataCDInfo-JTA-ejb/src/main...
Date Mon, 11 Jan 2010 06:58:02 GMT
Author: delos
Date: Mon Jan 11 06:58:01 2010
New Revision: 897768

URL: http://svn.apache.org/viewvc?rev=897768&view=rev
Log:
GERONIMO-4741 Make a new samples release with G 2.2 server - adding missing files in previous commit

Added:
    geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application.xml
    geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/beans/OwnerBean.java
    geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoAdminLocal.java
    geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/InvalidOwnerException.java
    geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/persistence.xml
    geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.added.xml
    geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.xml
    geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/plan/
    geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/plan/plan.xml
    geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-tomcat/src/
    geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/
    geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/history/
    geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/history/dependencies.xml
    geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/plan/
    geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/plan/plan.xml
    geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDActions.java
    geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/OwnerActions.java
    geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/resources/DataCDInfoResources.properties
    geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/META-INF/NOTICE
    geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/struts-config.xml
    geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/adminhome.html
    geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/auth/logon.html
    geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/RemoveCD.jsp
    geronimo/samples/branches/2.2/samples/csa-activemq/csa-activemq-jetty/
    geronimo/samples/branches/2.2/samples/csa-activemq/csa-activemq-jetty/pom.xml
    geronimo/samples/branches/2.2/samples/csa-activemq/csa-activemq-tomcat/
    geronimo/samples/branches/2.2/samples/csa-activemq/csa-activemq-tomcat/pom.xml

Added: geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application.xml?rev=897768&view=auto
==============================================================================
--- geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application.xml (added)
+++ geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/META-INF/geronimo-application.xml Mon Jan 11 06:58:01 2010
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<application application-name="DataCDInfo-JTA"
+	xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
+	<dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+		<dep:moduleId>
+			<dep:groupId>org.apache.geronimo.samples</dep:groupId>
+			<dep:artifactId>DataCDInfoJTA</dep:artifactId>
+			<dep:version>1.0</dep:version>
+			<dep:type>car</dep:type>
+		</dep:moduleId>
+		<dep:dependencies>
+			<dep:dependency>
+				<dep:groupId>org.apache.geronimo.configs</dep:groupId>
+                		<dep:artifactId>system-database</dep:artifactId>
+                		<dep:type>car</dep:type>
+			</dep:dependency>
+		</dep:dependencies>
+	</dep:environment>
+
+	<module>
+		<ejb>DataCDInfo-JTA-ejb.jar</ejb>
+		<openejb-jar xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2">
+			<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+				version="1.0">
+				<persistence-unit name="DataCDInfoUnit">
+					<properties>
+						<property name="openjpa.jdbc.DBDictionary" value="derby" />
+					</properties>
+				</persistence-unit>
+			</persistence>
+		</openejb-jar>
+	</module>
+
+	<ext-module>
+		<connector>DataCDInfoDataSource</connector>
+		<external-path xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+			<dep:groupId>org.tranql</dep:groupId>
+			<dep:artifactId>tranql-connector-derby-embed-xa</dep:artifactId>
+			<dep:type>rar</dep:type>
+		</external-path>
+		<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
+			<resourceadapter>
+				<outbound-resourceadapter>
+					<connection-definition>
+						<connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
+						<connectiondefinition-instance>
+							<name>jdbc/DataCDInfoDS</name>
+							<config-property-setting name="UserName"></config-property-setting>
+                            <config-property-setting name="Password"></config-property-setting>
+                            <config-property-setting name="DatabaseName">cdinfodb</config-property-setting>
+                            <config-property-setting name="CreateDatabase">true</config-property-setting>
+							<connectionmanager>
+								<xa-transaction>
+									<transaction-caching />
+								</xa-transaction>
+								<single-pool>
+									<max-size>100</max-size>
+									<min-size>0</min-size>
+									<blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+									<idle-timeout-minutes>30</idle-timeout-minutes>
+									<match-one />
+								</single-pool>
+							</connectionmanager>
+						</connectiondefinition-instance>
+						<!-- This non-transaction data source is for sequence generation use. Without it,
+						the geronimo will throw exception when persisting entities which require sequence
+						generation. -->
+						<connectiondefinition-instance>
+                            <name>jdbc/NoTxDataCDInfoDS</name>
+                            <config-property-setting name="UserName"></config-property-setting>
+                            <config-property-setting name="Password"></config-property-setting>
+                            <config-property-setting name="DatabaseName">cdinfodb</config-property-setting>
+                            <config-property-setting name="CreateDatabase">true</config-property-setting>
+                            <connectionmanager>
+                                <no-transaction/>
+                                <single-pool>
+                                    <max-size>10</max-size>
+                                    <min-size>0</min-size>
+                                    <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                                    <idle-timeout-minutes>30</idle-timeout-minutes>
+                                    <match-one/>
+                                </single-pool>
+                            </connectionmanager>
+                        </connectiondefinition-instance>
+					</connection-definition>
+				</outbound-resourceadapter>
+			</resourceadapter>
+		</connector>
+	</ext-module>
+	
+	
+
+  <security xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0">
+    <sec:default-principal>
+      <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="anonymous"/>
+    </sec:default-principal>
+    <sec:role-mappings>
+      <sec:role role-name="admin">
+        <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="admin"/>
+        <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="system"/>        
+      </sec:role>
+      <sec:role role-name="superadmin">
+        <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="superadmin"/>
+        <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="superman"/>        
+      </sec:role>
+    </sec:role-mappings>
+  </security>
+	
+	<gbean name="DBInitialization" class="org.apache.geronimo.connector.DatabaseInitializationGBean">
+        <attribute name="path">DataCDInfo_tables_derby.sql</attribute>
+        <reference name="DataSource">
+            <name>jdbc/NoTxDataCDInfoDS</name>
+        </reference>
+    </gbean>
+</application>

Added: geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/beans/OwnerBean.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/beans/OwnerBean.java?rev=897768&view=auto
==============================================================================
--- geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/beans/OwnerBean.java (added)
+++ geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/beans/OwnerBean.java Mon Jan 11 06:58:01 2010
@@ -0,0 +1,73 @@
+package org.apache.geronimo.samples.datacdinfo.beans;
+
+import java.io.Serializable;
+import java.util.Collection;
+
+import javax.persistence.*;
+
+/**
+ * Demo how to code JPA entity bean, including various JPA annotations.
+ * 
+ * @author forrestxm
+ *
+ */
+
+@Entity(name="Owner")
+@Table(name = "OWNER_TABLE")
+public class OwnerBean implements Serializable {
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -7231801785238251943L;
+	
+	
+	@Id
+	@Column(name = "USERNAME", length=20)
+	private String username;
+	
+	@Column(name = "PASSWORD", nullable=false, length=20)
+	private String password;
+	
+	@OneToMany(mappedBy= "owner", 
+			fetch=FetchType.LAZY,
+			cascade=CascadeType.ALL)	
+	@OrderBy("cdArchiveDate DESC")
+	private Collection<DataCDBean> DataCDs;
+	
+	public OwnerBean(){
+		
+	}
+	
+	public OwnerBean(String userName, String password) {
+		super();
+		this.username = userName;
+		this.password = password;
+	}
+	
+	public String toString(){
+		return "username:" + getUsername()
+				+ "\n password:" + getPassword();
+	}
+	
+	public String getUsername() {
+		return username;
+	}
+	public void setUsername(String userName) {
+		this.username = userName;
+	}
+	public String getPassword() {
+		return password;
+	}
+	public void setPassword(String password) {
+		this.password = password;
+	}
+
+	public void setDataCDs(Collection<DataCDBean> dataCDs) {
+		this.DataCDs = dataCDs;
+	}
+
+	public Collection<DataCDBean> getDataCDs() {
+		return DataCDs;
+	}
+
+}

Added: geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoAdminLocal.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoAdminLocal.java?rev=897768&view=auto
==============================================================================
--- geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoAdminLocal.java (added)
+++ geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/core/DataCDInfoAdminLocal.java Mon Jan 11 06:58:01 2010
@@ -0,0 +1,29 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.geronimo.samples.datacdinfo.core;
+
+import javax.ejb.Local;
+
+@Local
+public interface DataCDInfoAdminLocal {	
+	public String[] listOwners();	
+	public String findpasswd(String username);
+	public String[] listAllDataCDs();
+
+}

Added: geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/InvalidOwnerException.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/InvalidOwnerException.java?rev=897768&view=auto
==============================================================================
--- geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/InvalidOwnerException.java (added)
+++ geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/InvalidOwnerException.java Mon Jan 11 06:58:01 2010
@@ -0,0 +1,14 @@
+package org.apache.geronimo.samples.datacdinfo.exceptions;
+
+public class InvalidOwnerException extends Exception {
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -630847510922102546L;
+
+	public InvalidOwnerException(String error){
+		super(error);
+		
+	}
+
+}

Added: geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/persistence.xml?rev=897768&view=auto
==============================================================================
--- geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/persistence.xml (added)
+++ geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/persistence.xml Mon Jan 11 06:58:01 2010
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
+  <persistence-unit name="DataCDInfoUnit" transaction-type="JTA">
+    <description>DataCDInfo Persistence Unit Definition</description>
+    <jta-data-source>jdbc/DataCDInfoDS</jta-data-source>
+    <non-jta-data-source>jdbc/NoTxDataCDInfoDS</non-jta-data-source>	
+    <class>org.apache.geronimo.samples.datacdinfo.beans.OwnerBean</class>
+    <class>org.apache.geronimo.samples.datacdinfo.beans.DataCDBean</class>
+    <exclude-unlisted-classes>true</exclude-unlisted-classes>
+    <properties>      
+      <property name="openjpa.Sequence" value="table(Table=OPENJPASEQ, Increment=1)"/>       
+<!--      <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>-->
+<!--      <property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO"/>-->
+<property name="openjpa.Log" value="File=/tmp/org.apache.openjpa.log, DefaultLevel=WARN, Tool=INFO, Runtime=TRACE, SQL=TRACE"/>
+    </properties>
+  </persistence-unit>
+</persistence>
+

Added: geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.added.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.added.xml?rev=897768&view=auto
==============================================================================
--- geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.added.xml (added)
+++ geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.added.xml Mon Jan 11 06:58:01 2010
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
+    <module-id>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>DataCDInfo-JTA-jetty</artifactId>
+        <version>2.2</version>
+        <type>car</type>
+    </module-id>
+    <dependency>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>DataCDInfo-JTA-ear</artifactId>
+        <type>ear</type>
+    </dependency>
+</plugin-artifact>

Added: geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.xml?rev=897768&view=auto
==============================================================================
--- geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.xml (added)
+++ geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.xml Mon Jan 11 06:58:01 2010
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
+    <module-id>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>DataCDInfo-JTA-jetty</artifactId>
+        <version>2.2</version>
+        <type>car</type>
+    </module-id>
+    <dependency>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>DataCDInfo-JTA-ear</artifactId>
+        <type>ear</type>
+    </dependency>
+</plugin-artifact>

Added: geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/plan/plan.xml?rev=897768&view=auto
==============================================================================
--- geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/plan/plan.xml (added)
+++ geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-jetty/src/main/plan/plan.xml Mon Jan 11 06:58:01 2010
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<application application-name="DataCDInfo-JTA"
+	xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
+	<dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+		<dep:moduleId>
+			<dep:groupId>org.apache.geronimo.samples</dep:groupId>
+			<dep:artifactId>DataCDInfoJTA</dep:artifactId>
+			<dep:version>1.0</dep:version>
+			<dep:type>car</dep:type>
+		</dep:moduleId>
+		<dep:dependencies>
+			<dep:dependency>
+				<dep:groupId>org.apache.geronimo.configs</dep:groupId>
+                		<dep:artifactId>system-database</dep:artifactId>
+                		<dep:type>car</dep:type>
+			</dep:dependency>
+		</dep:dependencies>
+	</dep:environment>
+
+	<module>
+		<ejb>DataCDInfo-JTA-ejb.jar</ejb>
+		<openejb-jar xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2">
+			<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+				version="1.0">
+				<persistence-unit name="DataCDInfoUnit">
+					<properties>
+						<property name="openjpa.jdbc.DBDictionary" value="derby" />
+					</properties>
+				</persistence-unit>
+			</persistence>
+		</openejb-jar>
+	</module>
+
+	<ext-module>
+		<connector>DataCDInfoDataSource</connector>
+		<external-path xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+			<dep:groupId>org.tranql</dep:groupId>
+			<dep:artifactId>tranql-connector-derby-embed-xa</dep:artifactId>
+			<dep:type>rar</dep:type>
+		</external-path>
+		<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
+			<resourceadapter>
+				<outbound-resourceadapter>
+					<connection-definition>
+						<connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
+						<connectiondefinition-instance>
+							<name>jdbc/DataCDInfoDS</name>
+							<config-property-setting name="UserName"></config-property-setting>
+                            <config-property-setting name="Password"></config-property-setting>
+                            <config-property-setting name="DatabaseName">cdinfodb</config-property-setting>
+                            <config-property-setting name="CreateDatabase">true</config-property-setting>
+							<connectionmanager>
+								<xa-transaction>
+									<transaction-caching />
+								</xa-transaction>
+								<single-pool>
+									<max-size>100</max-size>
+									<min-size>0</min-size>
+									<blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+									<idle-timeout-minutes>30</idle-timeout-minutes>
+									<match-one />
+								</single-pool>
+							</connectionmanager>
+						</connectiondefinition-instance>
+						<!-- This non-transaction data source is for sequence generation use. Without it,
+						the geronimo will throw exception when persisting entities which require sequence
+						generation. -->
+						<connectiondefinition-instance>
+                            <name>jdbc/NoTxDataCDInfoDS</name>
+                            <config-property-setting name="UserName"></config-property-setting>
+                            <config-property-setting name="Password"></config-property-setting>
+                            <config-property-setting name="DatabaseName">cdinfodb</config-property-setting>
+                            <config-property-setting name="CreateDatabase">true</config-property-setting>
+                            <connectionmanager>
+                                <no-transaction/>
+                                <single-pool>
+                                    <max-size>10</max-size>
+                                    <min-size>0</min-size>
+                                    <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                                    <idle-timeout-minutes>30</idle-timeout-minutes>
+                                    <match-one/>
+                                </single-pool>
+                            </connectionmanager>
+                        </connectiondefinition-instance>
+					</connection-definition>
+				</outbound-resourceadapter>
+			</resourceadapter>
+		</connector>
+	</ext-module>
+	
+	
+
+  <security xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0">
+    <sec:default-principal>
+      <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="anonymous"/>
+    </sec:default-principal>
+    <sec:role-mappings>
+      <sec:role role-name="admin">
+        <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="admin"/>
+        <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="system"/>        
+      </sec:role>
+      <sec:role role-name="superadmin">
+        <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="superadmin"/>
+        <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="superman"/>        
+      </sec:role>
+    </sec:role-mappings>
+  </security>
+	
+	<gbean name="DBInitialization" class="org.apache.geronimo.connector.DatabaseInitializationGBean">
+        <attribute name="path">DataCDInfo_tables_derby.sql</attribute>
+        <reference name="DataSource">
+            <name>jdbc/NoTxDataCDInfoDS</name>
+        </reference>
+    </gbean>
+</application>

Added: geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/history/dependencies.xml?rev=897768&view=auto
==============================================================================
--- geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/history/dependencies.xml (added)
+++ geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/history/dependencies.xml Mon Jan 11 06:58:01 2010
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
+    <module-id>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>DataCDInfo-JTA-tomcat</artifactId>
+        <version>2.2</version>
+        <type>car</type>
+    </module-id>
+    <dependency>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>DataCDInfo-JTA-ear</artifactId>
+        <type>ear</type>
+    </dependency>
+</plugin-artifact>

Added: geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/plan/plan.xml?rev=897768&view=auto
==============================================================================
--- geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/plan/plan.xml (added)
+++ geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/plan/plan.xml Mon Jan 11 06:58:01 2010
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<application application-name="DataCDInfo-JTA"
+	xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
+	<dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+		<dep:moduleId>
+			<dep:groupId>org.apache.geronimo.samples</dep:groupId>
+			<dep:artifactId>DataCDInfoJTA</dep:artifactId>
+			<dep:version>1.0</dep:version>
+			<dep:type>car</dep:type>
+		</dep:moduleId>
+		<dep:dependencies>
+			<dep:dependency>
+				<dep:groupId>org.apache.geronimo.configs</dep:groupId>
+                		<dep:artifactId>system-database</dep:artifactId>
+                		<dep:type>car</dep:type>
+			</dep:dependency>
+		</dep:dependencies>
+	</dep:environment>
+
+	<module>
+		<ejb>DataCDInfo-JTA-ejb.jar</ejb>
+		<openejb-jar xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2">
+			<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+				version="1.0">
+				<persistence-unit name="DataCDInfoUnit">
+					<properties>
+						<property name="openjpa.jdbc.DBDictionary" value="derby" />
+					</properties>
+				</persistence-unit>
+			</persistence>
+		</openejb-jar>
+	</module>
+
+	<ext-module>
+		<connector>DataCDInfoDataSource</connector>
+		<external-path xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+			<dep:groupId>org.tranql</dep:groupId>
+			<dep:artifactId>tranql-connector-derby-embed-xa</dep:artifactId>
+			<dep:type>rar</dep:type>
+		</external-path>
+		<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
+			<resourceadapter>
+				<outbound-resourceadapter>
+					<connection-definition>
+						<connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
+						<connectiondefinition-instance>
+							<name>jdbc/DataCDInfoDS</name>
+							<config-property-setting name="UserName"></config-property-setting>
+                            <config-property-setting name="Password"></config-property-setting>
+                            <config-property-setting name="DatabaseName">cdinfodb</config-property-setting>
+                            <config-property-setting name="CreateDatabase">true</config-property-setting>
+							<connectionmanager>
+								<xa-transaction>
+									<transaction-caching />
+								</xa-transaction>
+								<single-pool>
+									<max-size>100</max-size>
+									<min-size>0</min-size>
+									<blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+									<idle-timeout-minutes>30</idle-timeout-minutes>
+									<match-one />
+								</single-pool>
+							</connectionmanager>
+						</connectiondefinition-instance>
+						<!-- This non-transaction data source is for sequence generation use. Without it,
+						the geronimo will throw exception when persisting entities which require sequence
+						generation. -->
+						<connectiondefinition-instance>
+                            <name>jdbc/NoTxDataCDInfoDS</name>
+                            <config-property-setting name="UserName"></config-property-setting>
+                            <config-property-setting name="Password"></config-property-setting>
+                            <config-property-setting name="DatabaseName">cdinfodb</config-property-setting>
+                            <config-property-setting name="CreateDatabase">true</config-property-setting>
+                            <connectionmanager>
+                                <no-transaction/>
+                                <single-pool>
+                                    <max-size>10</max-size>
+                                    <min-size>0</min-size>
+                                    <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
+                                    <idle-timeout-minutes>30</idle-timeout-minutes>
+                                    <match-one/>
+                                </single-pool>
+                            </connectionmanager>
+                        </connectiondefinition-instance>
+					</connection-definition>
+				</outbound-resourceadapter>
+			</resourceadapter>
+		</connector>
+	</ext-module>
+	
+	
+
+  <security xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0">
+    <sec:default-principal>
+      <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="anonymous"/>
+    </sec:default-principal>
+    <sec:role-mappings>
+      <sec:role role-name="admin">
+        <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="admin"/>
+        <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="system"/>        
+      </sec:role>
+      <sec:role role-name="superadmin">
+        <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="superadmin"/>
+        <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="superman"/>        
+      </sec:role>
+    </sec:role-mappings>
+  </security>
+	
+	<gbean name="DBInitialization" class="org.apache.geronimo.connector.DatabaseInitializationGBean">
+        <attribute name="path">DataCDInfo_tables_derby.sql</attribute>
+        <reference name="DataSource">
+            <name>jdbc/NoTxDataCDInfoDS</name>
+        </reference>
+    </gbean>
+</application>

Added: geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDActions.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDActions.java?rev=897768&view=auto
==============================================================================
--- geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDActions.java (added)
+++ geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDActions.java Mon Jan 11 06:58:01 2010
@@ -0,0 +1,116 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.geronimo.samples.datacdinfo.web.struts1;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.geronimo.samples.datacdinfo.beans.DataCDBean;
+import org.apache.geronimo.samples.datacdinfo.beans.OwnerBean;
+import org.apache.geronimo.samples.datacdinfo.core.DataCDInfoRemote;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
+import org.apache.struts.actions.MappingDispatchAction;
+
+public class DataCDActions extends MappingDispatchAction {
+
+	public static final String DATACD = "datacd";
+	public static final String OWNER = "owner";
+
+	public DataCDActions() {
+		// TODO Auto-generated constructor stub
+	}
+
+	public ActionForward update(ActionMapping mapping, ActionForm form,
+			HttpServletRequest request, HttpServletResponse response)
+			throws Exception {
+		HttpSession session = request.getSession();
+		ServletContext ctx = session.getServletContext();
+		DataCDInfoRemote logic = (DataCDInfoRemote) ctx.getAttribute("logic");
+
+		DataCDForm form1 = (DataCDForm) form;
+		logic.updateCD(form1.getCdID(), form1
+				.getCdSize(), form1.getCdDescription(), form1
+				.getCdArchiveDate());		
+
+		refreshOwnerForm(session, logic);
+
+		return mapping.findForward("success");
+
+	}
+
+	public ActionForward add(ActionMapping mapping, ActionForm form,
+			HttpServletRequest request, HttpServletResponse response)
+			throws Exception {
+		HttpSession session = request.getSession();
+		ServletContext ctx = session.getServletContext();
+		DataCDInfoRemote logic = (DataCDInfoRemote) ctx.getAttribute("logic");
+
+		DataCDForm form1 = (DataCDForm) form;		
+		// add a new CD
+		DataCDBean newcd = logic.addCD(form1.getOwner().getUsername(), form1.getCdLabel(), form1
+				.getCdSize(), form1.getCdDescription(), form1
+				.getCdArchiveDate());
+		if (newcd == null){
+			ActionMessages errors = new ActionMessages();
+			errors.add(ActionMessages.GLOBAL_MESSAGE,
+					new ActionMessage("errors.duplicated.cdlabel"));
+			this.saveErrors(request, errors);
+			return mapping.getInputForward();
+		}
+
+		refreshOwnerForm(session, logic);
+
+		return mapping.findForward("success");
+
+	}
+
+	public ActionForward remove(ActionMapping mapping, ActionForm form,
+			HttpServletRequest request, HttpServletResponse response)
+			throws Exception {
+		HttpSession session = request.getSession();
+		ServletContext ctx = session.getServletContext();
+		DataCDInfoRemote logic = (DataCDInfoRemote) ctx.getAttribute("logic");
+
+		DataCDForm form1 = (DataCDForm) form;
+		if (logic.removeCD(form1.getCdID())) {
+			refreshOwnerForm(session, logic);
+		}
+
+		return mapping.findForward("success");
+
+	}
+
+	private void refreshOwnerForm(HttpSession session, DataCDInfoRemote logic)
+			throws Exception {
+		// refresh owner object
+		OwnerForm ownerform = (OwnerForm) session.getAttribute(OWNER);
+		String ownername = ownerform.getUsername();
+		OwnerBean ownerbean = logic.refreshCDInfo(ownername);
+		PropertyUtils.copyProperties(ownerform, ownerbean);
+		session.setAttribute(OWNER, ownerform);
+	}
+
+}

Added: geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/OwnerActions.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/OwnerActions.java?rev=897768&view=auto
==============================================================================
--- geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/OwnerActions.java (added)
+++ geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/OwnerActions.java Mon Jan 11 06:58:01 2010
@@ -0,0 +1,114 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.geronimo.samples.datacdinfo.web.struts1;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.geronimo.samples.datacdinfo.beans.OwnerBean;
+import org.apache.geronimo.samples.datacdinfo.core.DataCDInfoRemote;
+import org.apache.geronimo.samples.datacdinfo.exceptions.IncorrectPasswordException;
+import org.apache.geronimo.samples.datacdinfo.exceptions.InvalidOwnerException;
+import org.apache.geronimo.samples.datacdinfo.exceptions.InvalidPasswordException;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
+import org.apache.struts.actions.MappingDispatchAction;
+
+public class OwnerActions extends MappingDispatchAction {
+	public static final String OWNER = "owner";
+
+	public ActionForward logon(ActionMapping mapping, ActionForm form,
+			HttpServletRequest request, HttpServletResponse response)
+			throws Exception {
+		HttpSession session = request.getSession();
+		OwnerForm ownerform = (OwnerForm) session.getAttribute(OWNER);
+		if (ownerform == null) {
+			ServletContext ctx = session.getServletContext();
+			DataCDInfoRemote logic = (DataCDInfoRemote) ctx
+					.getAttribute("logic");
+			OwnerBean owner = new OwnerBean();
+			PropertyUtils.copyProperties(owner, form);
+
+			try {
+				OwnerBean loginuser = logic.login(owner.getUsername(), owner
+						.getPassword());
+				PropertyUtils.copyProperties(form, loginuser);
+			} catch (Exception e) {
+				e.printStackTrace();
+				ActionMessages errors = new ActionMessages();
+				if (e instanceof InvalidOwnerException) {
+					errors.add(ActionMessages.GLOBAL_MESSAGE,
+							new ActionMessage("errors.invalid.owner"));
+
+				}
+				if (e instanceof IncorrectPasswordException) {
+					errors.add(ActionMessages.GLOBAL_MESSAGE,
+							new ActionMessage("errors.incorrect.password"));
+				}
+				this.saveErrors(request, errors);
+				return mapping.getInputForward();
+			}
+			session.setAttribute(OWNER, form);
+
+		}
+
+		return mapping.findForward("success");
+	}
+
+	public ActionForward register(ActionMapping mapping, ActionForm form,
+			HttpServletRequest request, HttpServletResponse response)
+			throws Exception {
+		HttpSession session = request.getSession();
+
+		ServletContext ctx = session.getServletContext();
+		DataCDInfoRemote logic = (DataCDInfoRemote) ctx.getAttribute("logic");
+		OwnerBean owner = new OwnerBean();
+		PropertyUtils.copyProperties(owner, form);
+
+		try {
+			OwnerBean loginuser = logic.register(owner.getUsername(), owner
+					.getPassword());
+			PropertyUtils.copyProperties(form, loginuser);
+		} catch (Exception e) {
+			System.out.println(e.getMessage());
+			ActionMessages errors = new ActionMessages();
+			if (e instanceof InvalidOwnerException) {
+				errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(
+						"errors.existing.owner"));
+
+			}
+			if (e instanceof InvalidPasswordException) {
+				errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(
+						"errors.invalid.password"));
+			}
+			this.saveErrors(request, errors);
+			return mapping.getInputForward();
+		}
+		session.setAttribute(OWNER, form);
+
+		return mapping.findForward("success");
+	}
+
+}

Added: geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/resources/DataCDInfoResources.properties
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/resources/DataCDInfoResources.properties?rev=897768&view=auto
==============================================================================
--- geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/resources/DataCDInfoResources.properties (added)
+++ geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/resources/DataCDInfoResources.properties Mon Jan 11 06:58:01 2010
@@ -0,0 +1,60 @@
+#   Licensed to the Apache Software Foundation (ASF) under one or more
+#   contributor license agreements.  See the NOTICE file distributed with
+#   this work for additional information regarding copyright ownership.
+#   The ASF licenses this file to You under the Apache License, Version 2.0
+#   (the "License"); you may not use this file except in compliance with
+#   the License.  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+
+logon.title=DataCDInfo Logon
+register.title=Register A New User
+prompt.username=Username
+prompt.password=Password
+prompt.password2=Retype Password
+errors.invalid.owner=Invalid owner!
+errors.incorrect.password=Incorrect password!
+errors.existing.owner=Owner existed!
+errors.invalid.password=Invalid password!
+datacd.cdlabel=CD Label
+datacd.cddescription=Content Description
+datacd.cdsize=Size(Mbytes)
+datacd.cdarchivedate=Archive Date
+datacd.operations=Operations
+datacd.operation.add=Add
+datacd.operation.edit=Update
+datacd.operation.remove=Remove
+datacd.operation.logout=Log Out
+datacd.operation.back=Return to list
+general.welcome=Welcome
+general.register=Register?
+general.administration=Administration
+button.submit=Submit
+button.reset=Reset
+button.update=Update
+button.remove=Confirm to remove
+button.add=Add
+errors.duplicated.cdlabel=Duplicated CD Label!
+
+# Standard error messages for validator framework checks
+errors.required={0} is required.
+errors.minlength={0} cannot be less than {1} characters.
+errors.maxlength={0} cannot be greater than {1} characters.
+errors.invalid={0} is invalid.
+errors.byte={0} must be an byte.
+errors.short={0} must be an short.
+errors.integer={0} must be an integer.
+errors.long={0} must be an long.
+errors.float={0} must be an float.
+errors.double={0} must be an double.
+errors.date={0} is not a date.
+errors.range={0} is not in the range {1} through {2}.
+errors.creditcard={0} is not a valid credit card number.
+errors.email={0} is an invalid e-mail address.
+errors.literal={0}

Added: geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/META-INF/NOTICE?rev=897768&view=auto
==============================================================================
--- geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/META-INF/NOTICE (added)
+++ geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/META-INF/NOTICE Mon Jan 11 06:58:01 2010
@@ -0,0 +1,8 @@
+
+Geronimo Samples :: DataCDInfo :: WAR via JTA
+Copyright 2003-2010 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+

Added: geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/struts-config.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/struts-config.xml?rev=897768&view=auto
==============================================================================
--- geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/struts-config.xml (added)
+++ geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/struts-config.xml Mon Jan 11 06:58:01 2010
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+   
+         http://www.apache.org/licenses/LICENSE-2.0
+   
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<!DOCTYPE struts-config PUBLIC
+          "-//Apache Software Foundation//DTD Struts Configuration 1.3//EN"
+          "http://struts.apache.org/dtds/struts-config_1_3.dtd">
+
+<struts-config>
+
+    <!-- ========== Form Bean Definitions ================================== -->
+    <form-beans>        
+        <form-bean 
+        	name="OwnerForm" 
+        	type="org.apache.geronimo.samples.datacdinfo.web.struts1.OwnerForm"/>
+        
+        <form-bean
+    		name="DataCDForm"
+    		type="org.apache.geronimo.samples.datacdinfo.web.struts1.DataCDForm"/>        
+
+    </form-beans>
+
+    <!-- ========== Global Forward Definitions ============================= -->
+
+    <global-forwards>
+        <forward name="home" path="/ListCDs.do"/>
+    </global-forwards>
+
+    <!-- ========== Action Mapping Definitions ============================= -->
+    <action-mappings>
+    
+    <action  path="/*" forward="/view/jsp/{1}.jsp">
+    </action>
+
+    <action path="/logon" 
+    		type="org.apache.geronimo.samples.datacdinfo.web.struts1.OwnerActions"
+    		name="OwnerForm"
+    		scope="request"
+            cancellable="true"
+            validate="true"            
+            parameter="logon"
+            input="/Logon.do">
+        <forward name="success" path="/ListCDs.do" redirect="true"/>        
+    </action>
+    
+    <action path="/register" 
+    		type="org.apache.geronimo.samples.datacdinfo.web.struts1.OwnerActions"
+    		name="OwnerForm"
+    		scope="request"
+            cancellable="true"
+            validate="true"            
+            parameter="register"
+            input="/Register.do">
+        <forward name="success" path="/ListCDs.do" redirect="true"/>        
+    </action>
+    
+    <action path="/updateCD" 
+    		type="org.apache.geronimo.samples.datacdinfo.web.struts1.DataCDActions"
+    		name="DataCDForm"
+    		scope="request"
+            cancellable="true"
+            validate="true"            
+            parameter="update"
+            input="/UpdateCD.do">
+        <forward name="success" path="/ListCDs.do" redirect="true"/>        
+    </action>
+    
+    <action path="/addCD" 
+    		type="org.apache.geronimo.samples.datacdinfo.web.struts1.DataCDActions"
+    		name="DataCDForm"
+    		scope="request"
+            cancellable="true"
+            validate="true"            
+            parameter="add"
+            input="/AddCD.do">
+        <forward name="success" path="/ListCDs.do" redirect="true"/>        
+    </action>
+    
+    <action path="/removeCD" 
+    		type="org.apache.geronimo.samples.datacdinfo.web.struts1.DataCDActions"
+    		name="DataCDForm"
+    		scope="request"
+            cancellable="false"
+            validate="true"            
+            parameter="remove">
+        <forward name="success" path="/ListCDs.do" redirect="true"/>        
+    </action>
+
+        
+
+    </action-mappings>
+
+    <!-- ========== Message Resources Definitions =========================== -->
+
+    <message-resources parameter="DataCDInfoResources" />
+
+    <!-- ========== Plug Ins Configuration ================================== -->
+    <plug-in className="org.apache.struts.validator.ValidatorPlugIn">
+        <set-property property="pathnames"
+                      value="/org/apache/struts/validator/validator-rules.xml,
+                             /WEB-INF/validation.xml" />
+    </plug-in>
+
+</struts-config>

Added: geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/adminhome.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/adminhome.html?rev=897768&view=auto
==============================================================================
--- geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/adminhome.html (added)
+++ geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/adminhome.html Mon Jan 11 06:58:01 2010
@@ -0,0 +1,36 @@
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>DataCDInfo Administration Home Page</title>
+</head>
+<body>
+<table border="0" width="80%" align="center">
+<tr><td align="right"><a href="../view/jsp/Logon.jsp">DataCDInfo Home Page</a></td></tr>
+<tr><td></td></tr>
+<tr><td></td></tr>
+<tr>
+<td align="center"><a href="adminServlet?action=listOwners">List Owners</a></td>
+</tr>
+<tr>
+<td align="center"><a href="adminServlet?action=listCDs">List CDs</a></td>
+</tr>
+</table>
+</body>
+</html>

Added: geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/auth/logon.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/auth/logon.html?rev=897768&view=auto
==============================================================================
--- geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/auth/logon.html (added)
+++ geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/auth/logon.html Mon Jan 11 06:58:01 2010
@@ -0,0 +1,35 @@
+<!--
+		Licensed to the Apache Software Foundation (ASF) under one or more
+		contributor license agreements. See the NOTICE file distributed with
+		this work for additional information regarding copyright ownership.
+		The ASF licenses this file to you under the Apache License, Version
+		2.0 (the "License"); you may not use this file except in compliance
+		with the License. You may obtain a copy of the License at
+
+		http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+		applicable law or agreed to in writing, software distributed under the
+		License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+		CONDITIONS OF ANY KIND, either express or implied. See the License for
+		the specific language governing permissions and limitations under the
+		License.
+-->
+<HTML>
+<H1>FORM Authentication</H1>
+<form method="POST" action="j_security_check">
+<table border="0" cellspacing="2" cellpadding="1">
+<tr>
+  <td>Username:</td>
+  <td><input size="12" value="" name="j_username" maxlength="25" type="text"></td>
+</tr>
+<tr>
+  <td>Password:</td>
+  <td><input size="12" value="" name="j_password" maxlength="25" type="password"></td>
+</tr>
+<tr>
+  <td colspan="2" align="center">
+    <input name="submit" type="submit" value="Login">
+  </td>
+</tr>
+</table>
+</form>
+</HTML>

Added: geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/RemoveCD.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/RemoveCD.jsp?rev=897768&view=auto
==============================================================================
--- geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/RemoveCD.jsp (added)
+++ geronimo/samples/branches/2.2/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/RemoveCD.jsp Mon Jan 11 06:58:01 2010
@@ -0,0 +1,93 @@
+<!--
+		Licensed to the Apache Software Foundation (ASF) under one or more
+		contributor license agreements. See the NOTICE file distributed with
+		this work for additional information regarding copyright ownership.
+		The ASF licenses this file to you under the Apache License, Version
+		2.0 (the "License"); you may not use this file except in compliance
+		with the License. You may obtain a copy of the License at
+
+		http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+		applicable law or agreed to in writing, software distributed under the
+		License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+		CONDITIONS OF ANY KIND, either express or implied. See the License for
+		the specific language governing permissions and limitations under the
+		License.
+-->
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html:xhtml/>
+<html>
+<head>
+<title>Remove CD</title>
+</head>
+<logic:notPresent name="owner">
+<logic:redirect href="Logon.do"></logic:redirect>
+</logic:notPresent>
+<body>
+
+<html:errors/>
+
+<html:form action="/removeCD">
+    <table border="0" width="80%" align="center">
+
+        <tr>
+            <th align="right">
+                <bean:message key="datacd.cdlabel"/>:
+            </th>
+            <td align="left">
+                <html:hidden property="cdLabel" value='<%= request.getParameter("cdLabel")%>'/>
+                <%=request.getParameter("cdLabel") %>
+            </td>
+        </tr>
+
+        <tr>
+            <th align="right">
+                <bean:message key="datacd.cddescription"/>:
+            </th>
+            <td align="left">
+                <html:hidden property="cdDescription" value='<%= request.getParameter("cdDescription")%>'/>
+                <%= request.getParameter("cdDescription")%>
+            </td>
+        </tr>
+        <tr>
+            <th align="right">
+                <bean:message key="datacd.cdsize"/>:
+            </th>
+            <td align="left">
+                <html:hidden property="cdSize" value='<%= request.getParameter("cdSize")%>'/>
+                <%= request.getParameter("cdSize")%>
+            </td>
+        </tr>
+        <tr>
+            <th align="right">
+                <bean:message key="datacd.cdarchivedate"/>:
+            </th>
+            <td align="left">
+                <html:hidden property="cdArchiveDate" value='<%= request.getParameter("cdArchiveDate")%>'/>
+                <%= request.getParameter("cdArchiveDate")%>
+            </td>
+        </tr>
+
+        <tr>
+            <td align="right">
+            	<html:hidden property="cdID" value='<%= request.getParameter("cdID")%>'/>
+                <html:submit property="DO_SUBMIT">
+                    <bean:message key="button.remove"/>
+                </html:submit>
+            </td>
+            <td align="left">
+                <html:link action="ListCDs.do"><bean:message key="datacd.operation.back"/></html:link>
+            </td>
+        </tr>
+
+    </table>
+
+</html:form>
+
+<html:javascript formName="DataCDForm"/>
+
+</body>
+</html>

Added: geronimo/samples/branches/2.2/samples/csa-activemq/csa-activemq-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.2/samples/csa-activemq/csa-activemq-jetty/pom.xml?rev=897768&view=auto
==============================================================================
--- geronimo/samples/branches/2.2/samples/csa-activemq/csa-activemq-jetty/pom.xml (added)
+++ geronimo/samples/branches/2.2/samples/csa-activemq/csa-activemq-jetty/pom.xml Mon Jan 11 06:58:01 2010
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+    
+       http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    
+    <modelVersion>4.0.0</modelVersion>
+    
+    <parent>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>csa-activemq</artifactId>
+        <version>2.2-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.samples</groupId>
+    <artifactId>csa-activemq-jetty</artifactId>
+    <name>Custom Server Assembly Sample :: ActiveMQ for Jetty</name>
+    <packaging>server-assembly</packaging>
+    
+    <description>
+        A Sample to demo how to use car-maven-plugin to assemble a server with ActiveMQ
+    </description>
+    
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.plugingroups</groupId>
+            <artifactId>framework</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+
+	<dependency>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>activemq-console-jetty</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+
+	<dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>activemq-ra</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+
+	<dependency>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>activemq-webconsole-jetty</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <servers>
+                        <serverInstance>
+                            <name>default</name>
+                            <configFile>var/config/config.xml</configFile>
+                            <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
+                            <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
+                            <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
+                        </serverInstance>
+                        <serverInstance>
+                            <name>client</name>
+                            <attributeManagerFrom>default</attributeManagerFrom>
+                            <artifactAliasesFile>var/config/client_artifact_aliases.properties</artifactAliasesFile>
+                        </serverInstance>
+                        <serverInstance>
+                            <name>offline</name>
+                            <configFile>var/config/offline-deployer-config.xml</configFile>
+                            <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
+                            <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
+                            <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
+                        </serverInstance>
+                        <serverInstance>
+                            <name>jsr88</name>
+                            <configFile>var/config/jsr88-configurer-config.xml</configFile>
+                            <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
+                            <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
+                            <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
+                        </serverInstance>
+                    </servers>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Added: geronimo/samples/branches/2.2/samples/csa-activemq/csa-activemq-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.2/samples/csa-activemq/csa-activemq-tomcat/pom.xml?rev=897768&view=auto
==============================================================================
--- geronimo/samples/branches/2.2/samples/csa-activemq/csa-activemq-tomcat/pom.xml (added)
+++ geronimo/samples/branches/2.2/samples/csa-activemq/csa-activemq-tomcat/pom.xml Mon Jan 11 06:58:01 2010
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+    
+       http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" 
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    
+    <modelVersion>4.0.0</modelVersion>
+    
+    <parent>
+        <groupId>org.apache.geronimo.samples</groupId>
+        <artifactId>csa-activemq</artifactId>
+        <version>2.2-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.geronimo.samples</groupId>
+    <artifactId>csa-activemq-tomcat</artifactId>
+    <name>Custom Server Assembly Sample :: ActiveMQ for Tomcat</name>
+    <packaging>server-assembly</packaging>
+    
+    <description>
+        A Sample to demo how to use car-maven-plugin to assemble a server with ActiveMQ
+    </description>
+    
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.framework.plugingroups</groupId>
+            <artifactId>framework</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+
+	<dependency>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>activemq-console-tomcat</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+
+	<dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>activemq-ra</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+
+	<dependency>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>activemq-webconsole-tomcat</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>car</type>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.buildsupport</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <servers>
+                        <serverInstance>
+                            <name>default</name>
+                            <configFile>var/config/config.xml</configFile>
+                            <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
+                            <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
+                            <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
+                        </serverInstance>
+                        <serverInstance>
+                            <name>client</name>
+                            <attributeManagerFrom>default</attributeManagerFrom>
+                            <artifactAliasesFile>var/config/client_artifact_aliases.properties</artifactAliasesFile>
+                        </serverInstance>
+                        <serverInstance>
+                            <name>offline</name>
+                            <configFile>var/config/offline-deployer-config.xml</configFile>
+                            <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
+                            <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
+                            <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
+                        </serverInstance>
+                        <serverInstance>
+                            <name>jsr88</name>
+                            <configFile>var/config/jsr88-configurer-config.xml</configFile>
+                            <configSubstitutionsFile>var/config/config-substitutions.properties</configSubstitutionsFile>
+                            <configSubstitutionsPrefix>org.apache.geronimo.config.substitution.</configSubstitutionsPrefix>
+                            <artifactAliasesFile>var/config/artifact_aliases.properties</artifactAliasesFile>
+                        </serverInstance>
+                    </servers>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>



Mime
View raw message