You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jb...@apache.org on 2008/06/12 00:09:40 UTC

svn commit: r666869 - in /geronimo/samples/branches/2.1: geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/src/main/resources/META-INF/ samples/ samples/dbtester/dbtester-war/src/main/webapp/WEB-INF/ samples/jaxws-calculator/...

Author: jbohn
Date: Wed Jun 11 15:09:39 2008
New Revision: 666869

URL: http://svn.apache.org/viewvc?rev=666869&view=rev
Log:
merge 666857 from trunk - remove embedded plans from most samples - did not include inventory or async-http in changes

Removed:
    geronimo/samples/branches/2.1/geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/src/main/resources/META-INF/geronimo-application.xml
    geronimo/samples/branches/2.1/samples/dbtester/dbtester-war/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/samples/branches/2.1/samples/jaxws-calculator/jaxws-calculator-war/src/main/webapp/WEB-INF/geronimo-web.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-war/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/samples/branches/2.1/samples/ldap-sample-app/ldap-sample-app-war/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-ear/src/main/resources/META-INF/geronimo-application.xml
    geronimo/samples/branches/2.1/samples/myphonebook/myphonebook-war/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/samples/branches/2.1/samples/mytime/mytime-ear/src/main/resources/META-INF/geronimo-application.xml
    geronimo/samples/branches/2.1/samples/mytime/mytime-war/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/samples/branches/2.1/samples/sendmail/sendmail-war/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-war/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/webapp/WEB-INF/geronimo-web.xml
Modified:
    geronimo/samples/branches/2.1/samples/pom.xml

Modified: geronimo/samples/branches/2.1/samples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/pom.xml?rev=666869&r1=666868&r2=666869&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/pom.xml Wed Jun 11 15:09:39 2008
@@ -183,12 +183,10 @@
                         <addMavenDescriptor>false</addMavenDescriptor>
                     </archive>
                     <osiApproved>true</osiApproved>
-                    <!--
-                    <useMavenDependencies>
-                        <value>true</value>
-                        <includeVersion>true</includeVersion>
-                    </useMavenDependencies>
-                    -->
+                    <!--<useMavenDependencies>-->
+                        <!--<value>true</value>-->
+                        <!--<includeVersion>true</includeVersion>-->
+                    <!--</useMavenDependencies>-->
                     <commonInstance>
                         <plugin-artifact>
                             <!--<geronimo-version>${geronimoVersion}</geronimo-version>-->