geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r640534 - in /geronimo/samples/branches/2.1/samples: jaxws-calculator/ jaxws-calculator/jaxws-calculator-ear/ jaxws-calculator/jaxws-calculator-ejb/ jms-mdb-sample/jms-mdb-sample-ear/src/main/resources/ jms-mdb-sample/jms-mdb-sample-ear/src...
Date Mon, 24 Mar 2008 19:26:43 GMT
Author: gawor
Date: Mon Mar 24 12:26:41 2008
New Revision: 640534

URL: http://svn.apache.org/viewvc?rev=640534&view=rev
Log:
merge some changes from trunk

Added:
    geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ear/src/main/resources/jms-resources.xml
  (with props)
Removed:
    geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-ejb/
Modified:
    geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-ear/pom.xml
    geronimo/samples/branches/2.1/samples/jaxws-calculator/pom.xml
    geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ear/src/main/resources/META-INF/geronimo-application.xml
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-jetty/pom.xml
    geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-tomcat/pom.xml
    geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml
    geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-realm/pom.xml
    geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml
    geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-jetty/pom.xml
    geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-tomcat/pom.xml

Modified: geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-ear/pom.xml?rev=640534&r1=640533&r2=640534&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-ear/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-ear/pom.xml Mon
Mar 24 12:26:41 2008
@@ -44,13 +44,6 @@
             <version>${version}</version>
             <type>war</type>
         </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.samples</groupId>
-            <artifactId>jaxws-calculator-ejb</artifactId>
-            <version>${version}</version>
-            <type>ejb</type>
-        </dependency>
     </dependencies>
 
     <build>
@@ -62,12 +55,6 @@
                     <description>Geronimo Sample EAR for jaxws-calculator</description>
                     <version>5</version>
                     <modules>
-                      <ejbModule>
-                            <groupId>org.apache.geronimo.samples</groupId>
-                            <artifactId>jaxws-calculator-ejb</artifactId>
-                            <bundleFileName>jaxws-calculator-ejb-${version}.jar</bundleFileName>
-                        </ejbModule>
-
                         <webModule>
                             <groupId>org.apache.geronimo.samples</groupId>
                             <artifactId>jaxws-calculator-war</artifactId>

Modified: geronimo/samples/branches/2.1/samples/jaxws-calculator/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jaxws-calculator/pom.xml?rev=640534&r1=640533&r2=640534&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jaxws-calculator/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jaxws-calculator/pom.xml Mon Mar 24 12:26:41 2008
@@ -40,7 +40,6 @@
     </description>
     
    <modules>
-        <module>jaxws-calculator-ejb</module>
         <module>jaxws-calculator-war</module>
         <module>jaxws-calculator-ear</module>
     </modules>

Modified: geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ear/src/main/resources/META-INF/geronimo-application.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ear/src/main/resources/META-INF/geronimo-application.xml?rev=640534&r1=640533&r2=640534&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ear/src/main/resources/META-INF/geronimo-application.xml
(original)
+++ geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ear/src/main/resources/META-INF/geronimo-application.xml
Mon Mar 24 12:26:41 2008
@@ -31,60 +31,6 @@
     </environment>
     <module>
        <connector>geronimo-activemq-ra-${geronimoVersion}.rar</connector>
-        <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
-            <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <dep:moduleId>
-                    <dep:groupId>${pom.groupId}</dep:groupId>
-                    <dep:artifactId>jms-resources</dep:artifactId>
-                    <dep:version>${version}</dep:version>
-                    <dep:type>rar</dep:type>
-                </dep:moduleId>
-                <dep:dependencies>
-                    <dep:dependency>
-                        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
-                        <dep:artifactId>activemq-broker</dep:artifactId>
-                        <dep:type>car</dep:type>
-                    </dep:dependency>
-                </dep:dependencies>
-            </dep:environment>
-            <resourceadapter>
-                <resourceadapter-instance>
-                    <resourceadapter-name>jms-resources</resourceadapter-name>
-                    <nam:workmanager xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.2">
-                        <nam:gbean-link>DefaultWorkManager</nam:gbean-link>
-                    </nam:workmanager>
-                </resourceadapter-instance>
-                <outbound-resourceadapter>
-                    <connection-definition>
-                        <connectionfactory-interface>javax.jms.ConnectionFactory</connectionfactory-interface>
-                        <connectiondefinition-instance>
-                            <name>OrderConnectionFactory</name>
-                            <implemented-interface>javax.jms.QueueConnectionFactory</implemented-interface>
-                            <implemented-interface>javax.jms.TopicConnectionFactory</implemented-interface>
-                            <connectionmanager>
-                                <xa-transaction>
-                                    <transaction-caching/>
-                                </xa-transaction>
-                                <single-pool>
-                                    <match-one/>
-                                </single-pool>
-                            </connectionmanager>
-                        </connectiondefinition-instance>
-                    </connection-definition>
-                </outbound-resourceadapter>
-            </resourceadapter>
-            <adminobject>
-                <adminobject-interface>javax.jms.Queue</adminobject-interface>
-                <adminobject-class>org.apache.activemq.command.ActiveMQQueue</adminobject-class>
-                <adminobject-instance>
-                    <message-destination-name>OrderQueue</message-destination-name>
-                    <config-property-setting name="PhysicalName">OrderQueue</config-property-setting>
-                </adminobject-instance>
-            </adminobject>
-            <adminobject>
-                <adminobject-interface>javax.jms.Topic</adminobject-interface>
-                <adminobject-class>org.apache.activemq.command.ActiveMQTopic</adminobject-class>
-            </adminobject>
-        </connector>
+       <alt-dd>jms-resources.xml</alt-dd>
     </module>
 </application>

Added: geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ear/src/main/resources/jms-resources.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ear/src/main/resources/jms-resources.xml?rev=640534&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ear/src/main/resources/jms-resources.xml
(added)
+++ geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ear/src/main/resources/jms-resources.xml
Mon Mar 24 12:26:41 2008
@@ -0,0 +1,74 @@
+<?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.
+-->
+<connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
+            <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+                <dep:moduleId>
+                    <dep:groupId>${pom.groupId}</dep:groupId>
+                    <dep:artifactId>jms-resources</dep:artifactId>
+                    <dep:version>${version}</dep:version>
+                    <dep:type>rar</dep:type>
+                </dep:moduleId>
+                <dep:dependencies>
+                    <dep:dependency>
+                        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
+                        <dep:artifactId>activemq-broker</dep:artifactId>
+                        <dep:type>car</dep:type>
+                    </dep:dependency>
+                </dep:dependencies>
+            </dep:environment>
+            <resourceadapter>
+                <resourceadapter-instance>
+                    <resourceadapter-name>jms-resources</resourceadapter-name>
+                    <nam:workmanager xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.2">
+                        <nam:gbean-link>DefaultWorkManager</nam:gbean-link>
+                    </nam:workmanager>
+                </resourceadapter-instance>
+                <outbound-resourceadapter>
+                    <connection-definition>
+                        <connectionfactory-interface>javax.jms.ConnectionFactory</connectionfactory-interface>
+                        <connectiondefinition-instance>
+                            <name>OrderConnectionFactory</name>
+                            <implemented-interface>javax.jms.QueueConnectionFactory</implemented-interface>
+                            <implemented-interface>javax.jms.TopicConnectionFactory</implemented-interface>
+                            <connectionmanager>
+                                <xa-transaction>
+                                    <transaction-caching/>
+                                </xa-transaction>
+                                <single-pool>
+                                    <match-one/>
+                                </single-pool>
+                            </connectionmanager>
+                        </connectiondefinition-instance>
+                    </connection-definition>
+                </outbound-resourceadapter>
+            </resourceadapter>
+            <adminobject>
+                <adminobject-interface>javax.jms.Queue</adminobject-interface>
+                <adminobject-class>org.apache.activemq.command.ActiveMQQueue</adminobject-class>
+                <adminobject-instance>
+                    <message-destination-name>OrderQueue</message-destination-name>
+                    <config-property-setting name="PhysicalName">OrderQueue</config-property-setting>
+                </adminobject-instance>
+            </adminobject>
+            <adminobject>
+                <adminobject-interface>javax.jms.Topic</adminobject-interface>
+                <adminobject-class>org.apache.activemq.command.ActiveMQTopic</adminobject-class>
+            </adminobject>
+</connector>

Propchange: geronimo/samples/branches/2.1/samples/jms-mdb-sample/jms-mdb-sample-ear/src/main/resources/jms-resources.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-jetty/pom.xml?rev=640534&r1=640533&r2=640534&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-jetty/pom.xml Mon Mar
24 12:26:41 2008
@@ -31,7 +31,7 @@
 
     <groupId>org.apache.geronimo.samples</groupId>
     <artifactId>jsp-examples-jetty</artifactId>
-    <name>Geronimo Configs :: JSP Examples Jetty</name>
+    <name>Geronimo Samples :: JSP Examples Jetty</name>
     <packaging>car</packaging>
     <description>
         The JSP examples originally developed for Tomcat. Can be found
@@ -99,8 +99,7 @@
                         <version>${version}</version>
                         <type>war</type>
                     </module>
-
-                    <category>Example</category>
+                    <category>Sample</category>
                     <useMavenDependencies>
                         <value>true</value>
                         <includeVersion>true</includeVersion>

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-tomcat/pom.xml?rev=640534&r1=640533&r2=640534&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-tomcat/pom.xml Mon Mar
24 12:26:41 2008
@@ -31,7 +31,7 @@
 
     <groupId>org.apache.geronimo.samples</groupId>
     <artifactId>jsp-examples-tomcat</artifactId>
-    <name>Geronimo Configs :: JSP Examples Tomcat</name>
+    <name>Geronimo Samples :: JSP Examples Tomcat</name>
     <packaging>car</packaging>
     <description>
         The JSP examples originally developed for Tomcat. Can be found
@@ -99,7 +99,7 @@
                         <version>${version}</version>
                         <type>war</type>
                     </module>
-                    <category>Example</category>
+                    <category>Sample</category>
                     <useMavenDependencies>
                         <value>true</value>
                         <includeVersion>true</includeVersion>

Modified: geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml?rev=640534&r1=640533&r2=640534&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml Mon
Mar 24 12:26:41 2008
@@ -29,9 +29,9 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>org.apache.geronimo.configs</groupId>
+    <groupId>org.apache.geronimo.samples</groupId>
     <artifactId>ldap-sample-app-jetty</artifactId>
-    <name>Geronimo Configs :: LDAP Sample for Jetty</name>
+    <name>Geronimo Samples :: LDAP Sample for Jetty</name>
     <packaging>car</packaging>
     
     <description>
@@ -111,7 +111,7 @@
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
-                    <category>Example</category>
+                    <category>Sample</category>
                     <instance>
                         <plugin-artifact>
                             <prerequisite>

Modified: geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-realm/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-realm/pom.xml?rev=640534&r1=640533&r2=640534&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-realm/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-realm/pom.xml Mon
Mar 24 12:26:41 2008
@@ -30,7 +30,7 @@
     </parent>
 
     <artifactId>ldap-sample-app-realm</artifactId>
-    <name>Geronimo Configs :: LDAP Sample Security Realm</name>
+    <name>Geronimo Samples :: LDAP Sample Security Realm</name>
     <packaging>car</packaging>
 
     <description>
@@ -90,7 +90,7 @@
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
-                    <category>Example</category>
+                    <category>Sample</category>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml?rev=640534&r1=640533&r2=640534&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml Mon
Mar 24 12:26:41 2008
@@ -29,9 +29,9 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>org.apache.geronimo.configs</groupId>
+    <groupId>org.apache.geronimo.samples</groupId>
     <artifactId>ldap-sample-app-tomcat</artifactId>
-    <name>Geronimo Configs :: LDAP Sample for Tomcat</name>
+    <name>Geronimo Samples :: LDAP Sample for Tomcat</name>
     <packaging>car</packaging>
 
     <description>
@@ -111,7 +111,7 @@
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
-                    <category>Example</category>
+                    <category>Sample</category>
                     <instance>
                         <plugin-artifact>
                             <prerequisite>

Modified: geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-jetty/pom.xml?rev=640534&r1=640533&r2=640534&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-jetty/pom.xml
(original)
+++ geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-jetty/pom.xml
Mon Mar 24 12:26:41 2008
@@ -31,7 +31,7 @@
 
     <groupId>org.apache.geronimo.samples</groupId>
     <artifactId>servlet-examples-jetty</artifactId>
-    <name>Geronimo Configs :: Servlet Examples for Jetty</name>
+    <name>Geronimo Samples :: Servlet Examples for Jetty</name>
     <packaging>car</packaging>
 
     <description>The Servlet examples originally developed for Tomcat. Can be found
via HTTP at /servlets-examples/ after installation. These examples give a basic introduction
to Servlet development along with sample code.</description> 
@@ -99,7 +99,7 @@
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
-                    <category>Example</category>
+                    <category>Sample</category>
                     <instance>
                         <plugin-artifact>
                             <prerequisite>

Modified: geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-tomcat/pom.xml?rev=640534&r1=640533&r2=640534&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-tomcat/pom.xml
(original)
+++ geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-tomcat/pom.xml
Mon Mar 24 12:26:41 2008
@@ -31,7 +31,7 @@
 
     <groupId>org.apache.geronimo.samples</groupId>
     <artifactId>servlet-examples-tomcat</artifactId>
-    <name>Geronimo Configs :: Servlet Examples for Tomcat</name>
+    <name>Geronimo Samples :: Servlet Examples for Tomcat</name>
     <packaging>car</packaging>
 
     <description>The Servlet examples originally developed for Tomcat. Can be found
via HTTP at /servlets-examples/ after installation. These examples give a basic introduction
to Servlet development along with sample code.</description> 
@@ -99,7 +99,7 @@
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
-                    <category>Example</category>
+                    <category>Sample</category>
                     <instance>
                         <plugin-artifact>
                             <prerequisite>



Mime
View raw message