You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xi...@apache.org on 2010/06/25 08:33:49 UTC
svn commit: r957816 [6/12] - in /geronimo/samples/branches/3.0-M1: ./
samples/ samples/all-samples/all-samples-jetty/
samples/all-samples/all-samples-tomcat/ samples/daytrader/
samples/daytrader/assemblies/ samples/daytrader/assemblies/javaee/
samples/...
Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/DuplicatedDataCDException.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/DuplicatedDataCDException.java?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/DuplicatedDataCDException.java (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/DuplicatedDataCDException.java Fri Jun 25 06:33:41 2010
@@ -1,47 +1,47 @@
-/**
- * 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.exceptions;
-
-public class DuplicatedDataCDException extends Exception {
-
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
- public DuplicatedDataCDException() {
- // TODO Auto-generated constructor stub
- }
-
- public DuplicatedDataCDException(String message) {
- super(message);
- // TODO Auto-generated constructor stub
- }
-
- public DuplicatedDataCDException(Throwable cause) {
- super(cause);
- // TODO Auto-generated constructor stub
- }
-
- public DuplicatedDataCDException(String message, Throwable cause) {
- super(message, cause);
- // TODO Auto-generated constructor stub
- }
-
-}
+/**
+ * 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.exceptions;
+
+public class DuplicatedDataCDException extends Exception {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ public DuplicatedDataCDException() {
+ // TODO Auto-generated constructor stub
+ }
+
+ public DuplicatedDataCDException(String message) {
+ super(message);
+ // TODO Auto-generated constructor stub
+ }
+
+ public DuplicatedDataCDException(Throwable cause) {
+ super(cause);
+ // TODO Auto-generated constructor stub
+ }
+
+ public DuplicatedDataCDException(String message, Throwable cause) {
+ super(message, cause);
+ // TODO Auto-generated constructor stub
+ }
+
+}
Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/IncorrectPasswordException.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/IncorrectPasswordException.java?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/IncorrectPasswordException.java (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/IncorrectPasswordException.java Fri Jun 25 06:33:41 2010
@@ -1,31 +1,31 @@
-/**
- * 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.exceptions;
-
-public class IncorrectPasswordException extends Exception {
- /**
- *
- */
- private static final long serialVersionUID = 2346094168148835037L;
-
- public IncorrectPasswordException(String error){
- super(error);
- }
-
-}
+/**
+ * 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.exceptions;
+
+public class IncorrectPasswordException extends Exception {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 2346094168148835037L;
+
+ public IncorrectPasswordException(String error){
+ super(error);
+ }
+
+}
Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/InvalidOwnerException.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/InvalidOwnerException.java?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/InvalidOwnerException.java (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/InvalidOwnerException.java Fri Jun 25 06:33:41 2010
@@ -1,32 +1,32 @@
-/**
- * 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.exceptions;
-
-public class InvalidOwnerException extends Exception {
- /**
- *
- */
- private static final long serialVersionUID = -630847510922102546L;
-
- public InvalidOwnerException(String error){
- super(error);
-
- }
-
-}
+/**
+ * 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.exceptions;
+
+public class InvalidOwnerException extends Exception {
+ /**
+ *
+ */
+ private static final long serialVersionUID = -630847510922102546L;
+
+ public InvalidOwnerException(String error){
+ super(error);
+
+ }
+
+}
Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/InvalidPasswordException.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/InvalidPasswordException.java?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/InvalidPasswordException.java (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/java/org/apache/geronimo/samples/datacdinfo/exceptions/InvalidPasswordException.java Fri Jun 25 06:33:41 2010
@@ -1,47 +1,47 @@
-/**
- * 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.exceptions;
-
-public class InvalidPasswordException extends Exception {
-
- /**
- *
- */
- private static final long serialVersionUID = 1878613214876245045L;
-
- public InvalidPasswordException() {
- // TODO Auto-generated constructor stub
- }
-
- public InvalidPasswordException(String message) {
- super(message);
- // TODO Auto-generated constructor stub
- }
-
- public InvalidPasswordException(Throwable cause) {
- super(cause);
- // TODO Auto-generated constructor stub
- }
-
- public InvalidPasswordException(String message, Throwable cause) {
- super(message, cause);
- // TODO Auto-generated constructor stub
- }
-
-}
+/**
+ * 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.exceptions;
+
+public class InvalidPasswordException extends Exception {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1878613214876245045L;
+
+ public InvalidPasswordException() {
+ // TODO Auto-generated constructor stub
+ }
+
+ public InvalidPasswordException(String message) {
+ super(message);
+ // TODO Auto-generated constructor stub
+ }
+
+ public InvalidPasswordException(Throwable cause) {
+ super(cause);
+ // TODO Auto-generated constructor stub
+ }
+
+ public InvalidPasswordException(String message, Throwable cause) {
+ super(message, cause);
+ // TODO Auto-generated constructor stub
+ }
+
+}
Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/ejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/ejb-jar.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/ejb-jar.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/ejb-jar.xml Fri Jun 25 06:33:41 2010
@@ -1,71 +1,71 @@
-<?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.
--->
-<ejb-jar version="3.0"
- xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd">
- <display-name>DataCDInfo Enterprise Bean Definitions</display-name>
-
- <enterprise-beans>
- <session>
- <ejb-name>ejb/DataCDInfoJTAImpl</ejb-name>
- <business-local>org.apache.geronimo.samples.datacdinfo.core.DataCDInfoLocal</business-local>
- <business-remote>org.apache.geronimo.samples.datacdinfo.core.DataCDInfoRemote</business-remote>
- <ejb-class>org.apache.geronimo.samples.datacdinfo.core.DataCDInfoJTAImpl</ejb-class>
-<!-- Stateful|Stateless -->
- <session-type>Stateless</session-type>
-<!-- Who manages transanction? Bean|Container -->
- <transaction-type>Container</transaction-type>
- </session>
-
- <!-- In code, the stateful session bean "DataCDinfoAdmin" is annotated without name,
- so the geronimo server will assign a default name to it, it's the bean simple name.
- However, the interesting is following definition will add an additional entry to JNDI
- and register a stateful session bean with name "ejb/DataCDInfoAdmin". Seems it does
- not override the annotated one. Why? -->
- <session>
- <ejb-name>ejb/DataCDInfoAdmin</ejb-name>
- <business-local>org.apache.geronimo.samples.datacdinfo.core.DataCDInfoAdminLocal</business-local>
- <ejb-class>org.apache.geronimo.samples.datacdinfo.core.DataCDInfoAdmin</ejb-class>
-<!-- Stateful|Stateless -->
- <session-type>Stateful</session-type>
-<!-- Who manages transanction? Bean|Container -->
- <transaction-type>Container</transaction-type>
- </session>
- </enterprise-beans>
-
- <assembly-descriptor>
- <method-permission>
- <role-name>superadmin</role-name>
- <method>
- <ejb-name>ejb/DataCDInfoAdmin</ejb-name>
- <method-name>*</method-name>
- </method>
- </method-permission>
- <!-- In code, role "admin" only has right to access listOwners method
- but via this xml definition, the role could also access listAllDataCDs method -->
- <method-permission>
- <role-name>admin</role-name>
- <method>
- <ejb-name>ejb/DataCDInfoAdmin</ejb-name>
- <method-name>listAllDataCDs</method-name>
- </method>
- </method-permission>
- </assembly-descriptor>
-</ejb-jar>
-
+<?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.
+-->
+<ejb-jar version="3.0"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd">
+ <display-name>DataCDInfo Enterprise Bean Definitions</display-name>
+
+ <enterprise-beans>
+ <session>
+ <ejb-name>ejb/DataCDInfoJTAImpl</ejb-name>
+ <business-local>org.apache.geronimo.samples.datacdinfo.core.DataCDInfoLocal</business-local>
+ <business-remote>org.apache.geronimo.samples.datacdinfo.core.DataCDInfoRemote</business-remote>
+ <ejb-class>org.apache.geronimo.samples.datacdinfo.core.DataCDInfoJTAImpl</ejb-class>
+<!-- Stateful|Stateless -->
+ <session-type>Stateless</session-type>
+<!-- Who manages transanction? Bean|Container -->
+ <transaction-type>Container</transaction-type>
+ </session>
+
+ <!-- In code, the stateful session bean "DataCDinfoAdmin" is annotated without name,
+ so the geronimo server will assign a default name to it, it's the bean simple name.
+ However, the interesting is following definition will add an additional entry to JNDI
+ and register a stateful session bean with name "ejb/DataCDInfoAdmin". Seems it does
+ not override the annotated one. Why? -->
+ <session>
+ <ejb-name>ejb/DataCDInfoAdmin</ejb-name>
+ <business-local>org.apache.geronimo.samples.datacdinfo.core.DataCDInfoAdminLocal</business-local>
+ <ejb-class>org.apache.geronimo.samples.datacdinfo.core.DataCDInfoAdmin</ejb-class>
+<!-- Stateful|Stateless -->
+ <session-type>Stateful</session-type>
+<!-- Who manages transanction? Bean|Container -->
+ <transaction-type>Container</transaction-type>
+ </session>
+ </enterprise-beans>
+
+ <assembly-descriptor>
+ <method-permission>
+ <role-name>superadmin</role-name>
+ <method>
+ <ejb-name>ejb/DataCDInfoAdmin</ejb-name>
+ <method-name>*</method-name>
+ </method>
+ </method-permission>
+ <!-- In code, role "admin" only has right to access listOwners method
+ but via this xml definition, the role could also access listAllDataCDs method -->
+ <method-permission>
+ <role-name>admin</role-name>
+ <method>
+ <ejb-name>ejb/DataCDInfoAdmin</ejb-name>
+ <method-name>listAllDataCDs</method-name>
+ </method>
+ </method-permission>
+ </assembly-descriptor>
+</ejb-jar>
+
Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/openejb-jar.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/openejb-jar.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/openejb-jar.xml Fri Jun 25 06:33:41 2010
@@ -1,33 +1,33 @@
-<?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.
--->
-<openejb-jar xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-2.0"
- xmlns:client="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0"
- xmlns:conn="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2"
- xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2"
- xmlns:name="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:pers="http://java.sun.com/xml/ns/persistence"
- xmlns:pkgen="http://openejb.apache.org/xml/ns/pkgen-2.1" xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0"
- xmlns:web="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
- <dep:environment>
- <dep:moduleId>
- <dep:groupId>org.apache.geronimo.samples</dep:groupId>
- <dep:artifactId>DataCDInfo-JTA-ejb</dep:artifactId>
- <dep:version>1.0</dep:version>
- <dep:type>car</dep:type>
- </dep:moduleId>
- </dep:environment>
-</openejb-jar>
+<?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.
+-->
+<openejb-jar xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-2.0"
+ xmlns:client="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0"
+ xmlns:conn="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2"
+ xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2"
+ xmlns:name="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:pers="http://java.sun.com/xml/ns/persistence"
+ xmlns:pkgen="http://openejb.apache.org/xml/ns/pkgen-2.1" xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0"
+ xmlns:web="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
+ <dep:environment>
+ <dep:moduleId>
+ <dep:groupId>org.apache.geronimo.samples</dep:groupId>
+ <dep:artifactId>DataCDInfo-JTA-ejb</dep:artifactId>
+ <dep:version>1.0</dep:version>
+ <dep:type>car</dep:type>
+ </dep:moduleId>
+ </dep:environment>
+</openejb-jar>
Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/persistence.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/persistence.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-ejb/src/main/resources/META-INF/persistence.xml Fri Jun 25 06:33:41 2010
@@ -1,34 +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="DefaultLevel=WARN, Tool=INFO, Runtime=TRACE, SQL=TRACE"/>
- </properties>
- </persistence-unit>
-</persistence>
-
+<?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="DefaultLevel=WARN, Tool=INFO, Runtime=TRACE, SQL=TRACE"/>
+ </properties>
+ </persistence-unit>
+</persistence>
+
Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/pom.xml Fri Jun 25 06:33:41 2010
@@ -1,127 +1,126 @@
-<?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.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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>DataCDInfo</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.geronimo.samples</groupId>
- <artifactId>DataCDInfo-JTA-jetty</artifactId>
- <name>Geronimo Samples :: DataCDInfo JTA + Struts1 Plugin for Jetty</name>
- <packaging>car</packaging>
-
- <description>Geronimo Samples DataCDInfo JTA+Struts1 Plugin for Jetty</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.samples</groupId>
- <artifactId>DataCDInfo-JTA-ear</artifactId>
- <version>${version}</version>
- <type>ear</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>${jetty}-deployer</artifactId>
- <version>${geronimoVersion}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jasper-deployer</artifactId>
- <version>${geronimoVersion}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jasper</artifactId>
- <version>${geronimoVersion}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>openejb-deployer</artifactId>
- <version>${geronimoVersion}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>persistence-jpa10-deployer</artifactId>
- <version>${geronimoVersion}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <resources>
- <resource>
- <directory>${pom.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
-
- <plugins>
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>car-maven-plugin</artifactId>
- <configuration>
- <deploymentConfigs>
- <deploymentConfig>${gbeanDeployer}</deploymentConfig>
- <deploymentConfig>${j2eeDeployer}</deploymentConfig>
- <deploymentConfig>${jettyDeployer}</deploymentConfig>
- <deploymentConfig>${jasperDeployer}</deploymentConfig>
- <deploymentConfig>${openejbDeployer}</deploymentConfig>
- <deploymentConfig>${jpaDeployer}</deploymentConfig>
- </deploymentConfigs>
- <module>
- <groupId>org.apache.geronimo.samples</groupId>
- <artifactId>DataCDInfo-JTA-ear</artifactId>
- <version>${version}</version>
- <type>ear</type>
- </module>
- <useMavenDependencies>
- <value>true</value>
- <includeVersion>true</includeVersion>
- </useMavenDependencies>
- <category>Sample</category>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
-
+<?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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<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>DataCDInfo</artifactId>
+ <version>3.0-M1-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>DataCDInfo-JTA-jetty</artifactId>
+ <name>Geronimo Samples :: DataCDInfo JTA + Struts1 Plugin for Jetty</name>
+ <packaging>car</packaging>
+
+ <description>Geronimo Samples DataCDInfo JTA+Struts1 Plugin for Jetty</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>DataCDInfo-JTA-ear</artifactId>
+ <version>${version}</version>
+ <type>ear</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>${jetty}-deployer</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>jasper-deployer</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>jasper</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>openejb-deployer</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>persistence-jpa20-deployer</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>${pom.basedir}/src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>car-maven-plugin</artifactId>
+ <configuration>
+ <deploymentConfigs>
+ <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+ <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+ <deploymentConfig>${jettyDeployer}</deploymentConfig>
+ <deploymentConfig>${jasperDeployer}</deploymentConfig>
+ <deploymentConfig>${openejbDeployer}</deploymentConfig>
+ <deploymentConfig>${jpaDeployer}</deploymentConfig>
+ </deploymentConfigs>
+ <module>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>DataCDInfo-JTA-ear</artifactId>
+ <version>${version}</version>
+ <type>ear</type>
+ </module>
+ <useMavenDependencies>
+ <value>true</value>
+ <includeVersion>true</includeVersion>
+ </useMavenDependencies>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
+
Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.added.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.added.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.added.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.added.xml Fri Jun 25 06:33:41 2010
@@ -1,14 +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>
+<?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>
Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.removed.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.removed.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.removed.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.removed.xml Fri Jun 25 06:33:41 2010
@@ -1,14 +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-war</artifactId>
- <type>war</type>
- </dependency>
-</plugin-artifact>
+<?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-war</artifactId>
+ <type>war</type>
+ </dependency>
+</plugin-artifact>
Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/dependencies.xml Fri Jun 25 06:33:41 2010
@@ -1,14 +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>
+<?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>
Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/treeListing.txt
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/treeListing.txt?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/treeListing.txt (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/src/main/history/treeListing.txt Fri Jun 25 06:33:41 2010
@@ -1,7 +1,7 @@
-local:active project artifact:
- artifact = active project artifact:
- artifact = active project artifact:
- artifact = org.apache.geronimo.samples:DataCDInfo-JTA-ear:ear:2.2:compile;
- project: MavenProject: org.apache.geronimo.samples:DataCDInfo-JTA-ear:2.2 @ /home/forrestxm/localbuild/rsaws/gsamplestrunk/samples/DataCDInfo/DataCDInfo-JTA-ear/pom.xml;
- project: MavenProject: org.apache.geronimo.samples:DataCDInfo-JTA-ear:2.2 @ /home/forrestxm/localbuild/rsaws/gsamplestrunk/samples/DataCDInfo/DataCDInfo-JTA-ear/pom.xml;
- project: MavenProject: org.apache.geronimo.samples:DataCDInfo-JTA-ear:2.2 @ /home/forrestxm/localbuild/rsaws/gsamplestrunk/samples/DataCDInfo/DataCDInfo-JTA-ear/pom.xml
+local:active project artifact:
+ artifact = active project artifact:
+ artifact = active project artifact:
+ artifact = org.apache.geronimo.samples:DataCDInfo-JTA-ear:ear:2.2:compile;
+ project: MavenProject: org.apache.geronimo.samples:DataCDInfo-JTA-ear:2.2 @ /home/forrestxm/localbuild/rsaws/gsamplestrunk/samples/DataCDInfo/DataCDInfo-JTA-ear/pom.xml;
+ project: MavenProject: org.apache.geronimo.samples:DataCDInfo-JTA-ear:2.2 @ /home/forrestxm/localbuild/rsaws/gsamplestrunk/samples/DataCDInfo/DataCDInfo-JTA-ear/pom.xml;
+ project: MavenProject: org.apache.geronimo.samples:DataCDInfo-JTA-ear:2.2 @ /home/forrestxm/localbuild/rsaws/gsamplestrunk/samples/DataCDInfo/DataCDInfo-JTA-ear/pom.xml
Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/src/main/plan/plan.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-jetty/src/main/plan/plan.xml Fri Jun 25 06:33:41 2010
@@ -1,131 +1,66 @@
-<?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>
+<?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:dependencies>
+ <dep:dependency>
+ <dep:groupId>org.apache.geronimo.samples</dep:groupId>
+ <dep:artifactId>sample-datasource</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>
+
+ <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>SampleNoTxDatasource</name>
+ </reference>
+ </gbean>
+</application>
Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-tomcat/pom.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-tomcat/pom.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-tomcat/pom.xml Fri Jun 25 06:33:41 2010
@@ -1,127 +1,127 @@
-<?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.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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>DataCDInfo</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.geronimo.samples</groupId>
- <artifactId>DataCDInfo-JTA-tomcat</artifactId>
- <name>Geronimo Samples :: DataCDInfo JTA + Struts1 Plugin for Tomcat</name>
- <packaging>car</packaging>
-
- <description>Geronimo Samples DataCDInfo JTA+Struts1 Plugin for Tomcat</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.samples</groupId>
- <artifactId>DataCDInfo-JTA-ear</artifactId>
- <version>${version}</version>
- <type>ear</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat6-deployer</artifactId>
- <version>${geronimoVersion}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jasper-deployer</artifactId>
- <version>${geronimoVersion}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jasper</artifactId>
- <version>${geronimoVersion}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>openejb-deployer</artifactId>
- <version>${geronimoVersion}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>persistence-jpa10-deployer</artifactId>
- <version>${geronimoVersion}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <resources>
- <resource>
- <directory>${pom.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
-
- <plugins>
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>car-maven-plugin</artifactId>
- <configuration>
- <deploymentConfigs>
- <deploymentConfig>${gbeanDeployer}</deploymentConfig>
- <deploymentConfig>${j2eeDeployer}</deploymentConfig>
- <deploymentConfig>${tomcatDeployer}</deploymentConfig>
- <deploymentConfig>${jasperDeployer}</deploymentConfig>
- <deploymentConfig>${openejbDeployer}</deploymentConfig>
- <deploymentConfig>${jpaDeployer}</deploymentConfig>
- </deploymentConfigs>
- <module>
- <groupId>org.apache.geronimo.samples</groupId>
- <artifactId>DataCDInfo-JTA-ear</artifactId>
- <version>${version}</version>
- <type>ear</type>
- </module>
- <useMavenDependencies>
- <value>true</value>
- <includeVersion>true</includeVersion>
- </useMavenDependencies>
- <category>Sample</category>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
-
+<?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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<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>DataCDInfo</artifactId>
+ <version>3.0-M1-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>DataCDInfo-JTA-tomcat</artifactId>
+ <name>Geronimo Samples :: DataCDInfo JTA + Struts1 Plugin for Tomcat</name>
+ <packaging>car</packaging>
+
+ <description>Geronimo Samples DataCDInfo JTA+Struts1 Plugin for Tomcat</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>DataCDInfo-JTA-ear</artifactId>
+ <version>${version}</version>
+ <type>ear</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>tomcat6-deployer</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>jasper-deployer</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>jasper</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>openejb-deployer</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.configs</groupId>
+ <artifactId>persistence-jpa10-deployer</artifactId>
+ <version>${geronimoVersion}</version>
+ <type>car</type>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>${pom.basedir}/src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>car-maven-plugin</artifactId>
+ <configuration>
+ <deploymentConfigs>
+ <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+ <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+ <deploymentConfig>${tomcatDeployer}</deploymentConfig>
+ <deploymentConfig>${jasperDeployer}</deploymentConfig>
+ <deploymentConfig>${openejbDeployer}</deploymentConfig>
+ <deploymentConfig>${jpaDeployer}</deploymentConfig>
+ </deploymentConfigs>
+ <module>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>DataCDInfo-JTA-ear</artifactId>
+ <version>${version}</version>
+ <type>ear</type>
+ </module>
+ <useMavenDependencies>
+ <value>true</value>
+ <includeVersion>true</includeVersion>
+ </useMavenDependencies>
+ <category>Sample</category>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
+
Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/history/dependencies.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/history/dependencies.xml Fri Jun 25 06:33:41 2010
@@ -1,14 +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>
+<?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>
Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/plan/plan.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-tomcat/src/main/plan/plan.xml Fri Jun 25 06:33:41 2010
@@ -1,131 +1,66 @@
-<?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>
+<?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:dependencies>
+ <dep:dependency>
+ <dep:groupId>org.apache.geronimo.samples</dep:groupId>
+ <dep:artifactId>sample-datasource</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>
+
+ <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.wrapper.DatabaseInitializationGBean">
+ <attribute name="path">DataCDInfo_tables_derby.sql</attribute>
+ <reference name="DataSource">
+ <name>SampleNoTxDatasource</name>
+ </reference>
+ </gbean>
+</application>