geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickmcgu...@apache.org
Subject svn commit: r950023 - in /geronimo/server/trunk: ./ framework/ framework/buildsupport/geronimo-assembly-archetype/src/main/resources/META-INF/maven/ framework/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/ framework/bu...
Date Tue, 01 Jun 2010 11:38:47 GMT
Author: rickmcguire
Date: Tue Jun  1 11:38:45 2010
New Revision: 950023

URL: http://svn.apache.org/viewvc?rev=950023&view=rev
Log:
merge in header file changes from M1

Removed:
    geronimo/server/trunk/framework/cl-factore.patch.1
    geronimo/server/trunk/plugins/wab/TODO
Modified:
    geronimo/server/trunk/   (props changed)
    geronimo/server/trunk/framework/   (props changed)
    geronimo/server/trunk/framework/buildsupport/geronimo-assembly-archetype/src/main/resources/META-INF/maven/archetype.xml
    geronimo/server/trunk/framework/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.sample.xml
    geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/META-INF/maven/archetype.xml
    geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.sample.xml
    geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/client   (props changed)
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo   (props changed)
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/shutdown   (props changed)
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/client.bat   (props changed)
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat   (props changed)
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/shutdown.bat   (props changed)
    geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties   (props changed)
    geronimo/server/trunk/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/   (props changed)
    geronimo/server/trunk/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/ModuleConfigurer.java   (props changed)
    geronimo/server/trunk/framework/modules/geronimo-deploy-tool/   (props changed)
    geronimo/server/trunk/framework/modules/geronimo-kernel/   (props changed)
    geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml   (props changed)
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/   (props changed)
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundle.java   (props changed)
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundleContext.java   (props changed)
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockRespository.java   (props changed)
    geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/SystemLog.java   (props changed)
    geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/impl/Log4jService.java   (props changed)
    geronimo/server/trunk/framework/modules/geronimo-rmi-loader/src/main/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImpl.java   (props changed)
    geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/   (props changed)
    geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanRootSupport.java   (props changed)
    geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanSupport.java   (props changed)
    geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DeploymentConfigurationSupport.java   (props changed)
    geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/XmlBeanSupport.java   (props changed)
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/   (props changed)
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/BootActivator.java   (props changed)
    geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/resources/   (props changed)
    geronimo/server/trunk/plugins/   (props changed)
    geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationConfigBuilder.java   (props changed)
    geronimo/server/trunk/plugins/bval/bval-deployer/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/   (props changed)
    geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilder.java   (props changed)
    geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/ConfigurationNameBuilder.java   (props changed)
    geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/test/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilderTest.java   (props changed)
    geronimo/server/trunk/plugins/connector-1_6/   (props changed)
    geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/   (props changed)
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/   (props changed)
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/jms-resource-providers.properties
    geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/openejb/   (props changed)
    geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/   (props changed)
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java   (props changed)
    geronimo/server/trunk/plugins/uddi/uddi-db/src/main/appended-resources/META-INF/NOTICE.vm
    geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java   (props changed)
    geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerConstants.java   (props changed)
    geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerEventDispatcher.java   (props changed)
    geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerExtender.java   (props changed)
    geronimo/server/trunk/plugins/welcome/welcome-jetty-server/pom.sample.xml
    geronimo/server/trunk/plugins/welcome/welcome-tomcat-server/pom.sample.xml
    geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/filtered-resources/   (props changed)
    geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/src/main/filtered-resources/   (props changed)

Propchange: geronimo/server/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  1 11:38:45 2010
@@ -1 +1,2 @@
 /geronimo/server/branches/2.2:832538,885058
+/geronimo/server/branches/3.0-M1:948864

Propchange: geronimo/server/trunk/framework/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  1 11:38:45 2010
@@ -1,2 +1,3 @@
 /geronimo/server/branches/2.2/framework:826768,832538,885058
+/geronimo/server/branches/3.0-M1/framework:948864
 /geronimo/server/trunk/framework:749113,749116-807432,809079-825588

Modified: geronimo/server/trunk/framework/buildsupport/geronimo-assembly-archetype/src/main/resources/META-INF/maven/archetype.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/geronimo-assembly-archetype/src/main/resources/META-INF/maven/archetype.xml?rev=950023&r1=950022&r2=950023&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/geronimo-assembly-archetype/src/main/resources/META-INF/maven/archetype.xml (original)
+++ geronimo/server/trunk/framework/buildsupport/geronimo-assembly-archetype/src/main/resources/META-INF/maven/archetype.xml Tue Jun  1 11:38:45 2010
@@ -1,3 +1,19 @@
+<!--
+    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.
+-->
 <archetype>
   <id>geronimo-assembly-archetype</id>
     <resources>

Modified: geronimo/server/trunk/framework/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.sample.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.sample.xml?rev=950023&r1=950022&r2=950023&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.sample.xml (original)
+++ geronimo/server/trunk/framework/buildsupport/geronimo-assembly-archetype/src/main/resources/archetype-resources/pom.sample.xml Tue Jun  1 11:38:45 2010
@@ -1,3 +1,19 @@
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>

Modified: geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/META-INF/maven/archetype.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/META-INF/maven/archetype.xml?rev=950023&r1=950022&r2=950023&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/META-INF/maven/archetype.xml (original)
+++ geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/META-INF/maven/archetype.xml Tue Jun  1 11:38:45 2010
@@ -1,3 +1,19 @@
+<!--
+  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.
+-->
 <archetype>
   <id>geronimo-plugin-archetype</id>
   <resources>

Modified: geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.sample.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.sample.xml?rev=950023&r1=950022&r2=950023&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.sample.xml (original)
+++ geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.sample.xml Tue Jun  1 11:38:45 2010
@@ -1,3 +1,19 @@
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>

Modified: geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml?rev=950023&r1=950022&r2=950023&view=diff
==============================================================================
--- geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ geronimo/server/trunk/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml Tue Jun  1 11:38:45 2010
@@ -1,3 +1,19 @@
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>

Propchange: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/client
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  1 11:38:45 2010
@@ -1,2 +1,3 @@
 /geronimo/server/branches/2.2/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/karaf:826768
+/geronimo/server/branches/3.0-M1/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/client:948864
 /geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/karaf:749113,749116-807432,809079-825588

Propchange: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  1 11:38:45 2010
@@ -1,2 +1,3 @@
 /geronimo/server/branches/2.2/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/karaf:826768
+/geronimo/server/branches/3.0-M1/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo:948864
 /geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/karaf:749113,749116-807432,809079-825588

Propchange: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/shutdown
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  1 11:38:45 2010
@@ -1,2 +1,3 @@
 /geronimo/server/branches/2.2/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/karaf:826768
+/geronimo/server/branches/3.0-M1/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/shutdown:948864
 /geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/karaf:749113,749116-807432,809079-825588

Propchange: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/client.bat
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  1 11:38:45 2010
@@ -1,2 +1,3 @@
 /geronimo/server/branches/2.2/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/karaf.bat:826768
+/geronimo/server/branches/3.0-M1/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/client.bat:948864
 /geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/karaf.bat:749113,749116-807432,809079-825588

Propchange: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  1 11:38:45 2010
@@ -1,2 +1,3 @@
 /geronimo/server/branches/2.2/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/karaf.bat:826768
+/geronimo/server/branches/3.0-M1/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat:948864
 /geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/karaf.bat:749113,749116-807432,809079-825588

Propchange: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/shutdown.bat
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  1 11:38:45 2010
@@ -1,2 +1,3 @@
 /geronimo/server/branches/2.2/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/karaf.bat:826768
+/geronimo/server/branches/3.0-M1/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/shutdown.bat:948864
 /geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/karaf.bat:749113,749116-807432,809079-825588

Propchange: geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  1 11:38:45 2010
@@ -1 +1,2 @@
+/geronimo/server/branches/3.0-M1/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties:948864
 /geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties:809079-825588

Propchange: geronimo/server/trunk/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  1 11:38:45 2010
@@ -1 +1,2 @@
+/geronimo/server/branches/3.0-M1/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi:948864
 /geronimo/server/trunk/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi:749113,749116-807432,809079-825588*

Propchange: geronimo/server/trunk/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/ModuleConfigurer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  1 11:38:45 2010
@@ -1 +1,2 @@
+/geronimo/server/branches/3.0-M1/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/ModuleConfigurer.java:948864
 /geronimo/server/trunk/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/ModuleConfigurer.java:749113,749116-807432,809079-825588

Propchange: geronimo/server/trunk/framework/modules/geronimo-deploy-tool/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  1 11:38:45 2010
@@ -1,2 +1,3 @@
 /geronimo/server/branches/2.2/framework/modules/geronimo-deploy-tool:826768,832538,885058,917413
+/geronimo/server/branches/3.0-M1/framework/modules/geronimo-deploy-tool:948864
 /geronimo/server/trunk/framework/modules/geronimo-deploy-tool:749113,749116-807432,809079-825588

Propchange: geronimo/server/trunk/framework/modules/geronimo-kernel/
            ('svn:mergeinfo' removed)

Propchange: geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  1 11:38:45 2010
@@ -1 +1,2 @@
 /geronimo/server/branches/2.2/framework/modules/geronimo-kernel/pom.xml:832538,885058
+/geronimo/server/branches/3.0-M1/framework/modules/geronimo-kernel/pom.xml:948864

Propchange: geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  1 11:38:45 2010
@@ -1 +1,2 @@
+/geronimo/server/branches/3.0-M1/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi:948864
 /geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi:749113,749116-807432,809079-825588*

Propchange: geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundle.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  1 11:38:45 2010
@@ -1 +1,2 @@
+/geronimo/server/branches/3.0-M1/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundle.java:948864
 /geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundle.java:749113,749116-807432,809079-825588

Propchange: geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundleContext.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  1 11:38:45 2010
@@ -1 +1,2 @@
+/geronimo/server/branches/3.0-M1/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundleContext.java:948864
 /geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundleContext.java:749113,749116-807432,809079-825588

Propchange: geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockRespository.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  1 11:38:45 2010
@@ -1 +1,2 @@
+/geronimo/server/branches/3.0-M1/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockRespository.java:948864
 /geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockRespository.java:749113,749116-807432,809079-825588

Propchange: geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/SystemLog.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  1 11:38:45 2010
@@ -1,2 +1,3 @@
 /geronimo/server/branches/2.2/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/SystemLog.java:826768
+/geronimo/server/branches/3.0-M1/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/SystemLog.java:948864
 /geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/SystemLog.java:749113,749116-807432,809079-825588

Propchange: geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/impl/Log4jService.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  1 11:38:45 2010
@@ -1,2 +1,3 @@
 /geronimo/server/branches/2.2/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/log4j/Log4jService.java:826768
+/geronimo/server/branches/3.0-M1/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/impl/Log4jService.java:948864
 /geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/logging/log4j/Log4jService.java:749113,749116-807432,809079-825588

Propchange: geronimo/server/trunk/framework/modules/geronimo-rmi-loader/src/main/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImpl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  1 11:38:45 2010
@@ -1 +1,2 @@
+/geronimo/server/branches/3.0-M1/framework/modules/geronimo-rmi-loader/src/main/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImpl.java:948864
 /geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImpl.java:749113,749116-807432,809079-825588

Propchange: geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  1 11:38:45 2010
@@ -1 +1,2 @@
+/geronimo/server/branches/3.0-M1/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean:948864
 /geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean:749113,749116-807432,809079-825588*

Propchange: geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanRootSupport.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  1 11:38:45 2010
@@ -1 +1,2 @@
+/geronimo/server/branches/3.0-M1/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanRootSupport.java:948864
 /geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanRootSupport.java:749113,749116-807432,809079-825588

Propchange: geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanSupport.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  1 11:38:45 2010
@@ -1 +1,2 @@
+/geronimo/server/branches/3.0-M1/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanSupport.java:948864
 /geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanSupport.java:749113,749116-807432,809079-825588

Propchange: geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DeploymentConfigurationSupport.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  1 11:38:45 2010
@@ -1 +1,2 @@
+/geronimo/server/branches/3.0-M1/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DeploymentConfigurationSupport.java:948864
 /geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DeploymentConfigurationSupport.java:749113,749116-807432,809079-825588

Propchange: geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/XmlBeanSupport.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  1 11:38:45 2010
@@ -1 +1,2 @@
+/geronimo/server/branches/3.0-M1/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/XmlBeanSupport.java:948864
 /geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/XmlBeanSupport.java:749113,749116-807432,809079-825588

Propchange: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  1 11:38:45 2010
@@ -1 +1,2 @@
+/geronimo/server/branches/3.0-M1/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi:948864
 /geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi:749113,749116-807432,809079-825588*

Propchange: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/BootActivator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  1 11:38:45 2010
@@ -1 +1,2 @@
+/geronimo/server/branches/3.0-M1/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/BootActivator.java:948864
 /geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/BootActivator.java:749113,749116-807432,809079-825588

Propchange: geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  1 11:38:45 2010
@@ -1,2 +1,3 @@
 /geronimo/server/branches/2.2/framework/modules/geronimo-upgrade/src/test/resources:826768,832538,885058
+/geronimo/server/branches/3.0-M1/framework/modules/geronimo-upgrade/src/test/resources:948864
 /geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/resources:809079-825588

Propchange: geronimo/server/trunk/plugins/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  1 11:38:45 2010
@@ -1,2 +1,3 @@
 /geronimo/server/branches/2.2/plugins:832538,885058
+/geronimo/server/branches/3.0-M1/plugins:948864
 /geronimo/server/trunk/plugins/j2ee:887507

Propchange: geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationConfigBuilder.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  1 11:38:45 2010
@@ -0,0 +1 @@
+/geronimo/server/branches/3.0-M1/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationConfigBuilder.java:948864

Modified: geronimo/server/trunk/plugins/bval/bval-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/bval/bval-deployer/src/main/history/dependencies.xml?rev=950023&r1=950022&r2=950023&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/bval/bval-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/bval/bval-deployer/src/main/history/dependencies.xml Tue Jun  1 11:38:45 2010
@@ -7,6 +7,41 @@
         <type>car</type>
     </module-id>
     <dependency>
+        <groupId>com.thoughtworks.xstream</groupId>
+        <artifactId>xstream</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>commons-beanutils</groupId>
+        <artifactId>commons-beanutils</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>commons-collections</groupId>
+        <artifactId>commons-collections</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>commons-lang</groupId>
+        <artifactId>commons-lang</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.bval</groupId>
+        <artifactId>bval-core</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.bval</groupId>
+        <artifactId>bval-jsr303</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.bval</groupId>
         <artifactId>org.apache.bval.bundle</artifactId>
         <type>jar</type>
@@ -31,4 +66,9 @@
         <artifactId>geronimo-validation_1.0_spec</artifactId>
         <type>jar</type>
     </dependency>
+    <dependency>
+        <groupId>xpp3</groupId>
+        <artifactId>xpp3_min</artifactId>
+        <type>jar</type>
+    </dependency>
 </plugin-artifact>

Propchange: geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  1 11:38:45 2010
@@ -1,3 +1,4 @@
 /geronimo/server/branches/2.1/plugins/clustering/geronimo-farm:903520
 /geronimo/server/branches/2.2/plugins/clustering/geronimo-deploy-farm:832538,885058
+/geronimo/server/branches/3.0-M1/plugins/clustering/geronimo-deploy-farm:948864
 /geronimo/server/trunk/plugins/j2ee/clustering/geronimo-deploy-farm:887507

Propchange: geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilder.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  1 11:38:45 2010
@@ -1,2 +1,3 @@
 /geronimo/server/branches/2.1/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilder.java:903520
 /geronimo/server/branches/2.2/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilder.java:832538
+/geronimo/server/branches/3.0-M1/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilder.java:948864

Propchange: geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/ConfigurationNameBuilder.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  1 11:38:45 2010
@@ -1,2 +1,3 @@
 /geronimo/server/branches/2.1/plugins/clustering/geronimo-farm/src/main/java/org/apache/geronimo/farm/deployment/ConfigurationNameBuilder.java:903520
 /geronimo/server/branches/2.2/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/ConfigurationNameBuilder.java:832538
+/geronimo/server/branches/3.0-M1/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/ConfigurationNameBuilder.java:948864

Propchange: geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/test/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  1 11:38:45 2010
@@ -1 +1,2 @@
 /geronimo/server/branches/2.2/plugins/clustering/geronimo-deploy-farm/src/test/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilderTest.java:832538
+/geronimo/server/branches/3.0-M1/plugins/clustering/geronimo-deploy-farm/src/test/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilderTest.java:948864

Propchange: geronimo/server/trunk/plugins/connector-1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  1 11:38:45 2010
@@ -1 +1,2 @@
+/geronimo/server/branches/3.0-M1/plugins/connector-1_6:948864
 /geronimo/server/trunk/plugins/connector:799922,803943

Propchange: geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  1 11:38:45 2010
@@ -1,2 +1,3 @@
+/geronimo/server/branches/3.0-M1/plugins/connector-1_6/connector-deployer-1_6:948864
 /geronimo/server/trunk/plugins/connector/connector-deployer:803943
 /geronimo/server/trunk/plugins/connector/connector-deployer-1_6:799922,803943

Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  1 11:38:45 2010
@@ -1,2 +1,3 @@
+/geronimo/server/branches/3.0-M1/plugins/connector-1_6/geronimo-connector-builder-1_6:948864
 /geronimo/server/trunk/plugins/connector/geronimo-connector-builder:799922
 /geronimo/server/trunk/plugins/connector/geronimo-connector-builder-1_6:799922,803943

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/jms-resource-providers.properties
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/jms-resource-providers.properties?rev=950023&r1=950022&r2=950023&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/jms-resource-providers.properties (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/i18n-resources/jms-resource-providers.properties Tue Jun  1 11:38:45 2010
@@ -0,0 +1,18 @@
+#Generated by ResourceBundle Editor (http://eclipse-rbe.sourceforge.net)
+#=====================================================================
+#  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$

Modified: geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml?rev=950023&r1=950022&r2=950023&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/j2ee/j2ee-server/src/main/history/dependencies.xml Tue Jun  1 11:38:45 2010
@@ -27,33 +27,8 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-osgi-registry</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>org.apache.servicemix.bundles.howl</artifactId>
         <type>jar</type>
     </dependency>
-    <dependency>
-        <groupId>org.apache.servicemix.bundles</groupId>
-        <artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.xbean</groupId>
-        <artifactId>xbean-bundleutils</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.xbean</groupId>
-        <artifactId>xbean-finder</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.xbean</groupId>
-        <artifactId>xbean-reflect</artifactId>
-        <type>jar</type>
-    </dependency>
 </plugin-artifact>

Propchange: geronimo/server/trunk/plugins/openejb/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  1 11:38:45 2010
@@ -1,2 +1,3 @@
 /geronimo/server/branches/2.2/plugins/openejb:830343,830385,830420,830443,830766,831498,831811,832538,885058,941914
+/geronimo/server/branches/3.0-M1/plugins/openejb:948864
 /geronimo/server/trunk/plugins/j2ee/openejb:887507

Propchange: geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  1 11:38:45 2010
@@ -1,3 +1,4 @@
 /geronimo/server/branches/2.2/plugins/openjpa/geronimo-persistence-jpa10-builder:829715
 /geronimo/server/branches/2.2/plugins/openjpa/geronimo-persistence-jpa20-builder:829715
 /geronimo/server/branches/2.2/plugins/openjpa2/geronimo-persistence-jpa20-builder:829426,829715,832538,885058
+/geronimo/server/branches/3.0-M1/plugins/openjpa2/geronimo-persistence-jpa20-builder:948864

Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  1 11:38:45 2010
@@ -1 +1,2 @@
+/geronimo/server/branches/3.0-M1/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java:948864
 /tomcat/tc6.0.x/trunk/java/org/apache/naming/resources/BaseDirContext.java:742915

Modified: geronimo/server/trunk/plugins/uddi/uddi-db/src/main/appended-resources/META-INF/NOTICE.vm
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/uddi/uddi-db/src/main/appended-resources/META-INF/NOTICE.vm?rev=950023&r1=950022&r2=950023&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/uddi/uddi-db/src/main/appended-resources/META-INF/NOTICE.vm (original)
+++ geronimo/server/trunk/plugins/uddi/uddi-db/src/main/appended-resources/META-INF/NOTICE.vm Tue Jun  1 11:38:45 2010
@@ -1,3 +1,23 @@
+##
+## 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$
+##
 Portions of the UDDI integration were developed by the Apache Web Services
 jUDDI community.
 

Propchange: geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  1 11:38:45 2010
@@ -1,2 +1,3 @@
 /geronimo/server/branches/2.2/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/WebApplication.java:832538,885058
+/geronimo/server/branches/3.0-M1/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java:948864
 /geronimo/server/trunk/plugins/j2ee/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/WebApplication.java:887507

Propchange: geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerConstants.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  1 11:38:45 2010
@@ -1,2 +1,3 @@
 /geronimo/server/branches/2.2/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/WebContainerConstants.java:832538,885058
+/geronimo/server/branches/3.0-M1/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerConstants.java:948864
 /geronimo/server/trunk/plugins/j2ee/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/WebContainerConstants.java:887507

Propchange: geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerEventDispatcher.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  1 11:38:45 2010
@@ -1,2 +1,3 @@
 /geronimo/server/branches/2.2/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/WebContainerEventDispatcher.java:832538,885058
+/geronimo/server/branches/3.0-M1/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerEventDispatcher.java:948864
 /geronimo/server/trunk/plugins/j2ee/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/WebContainerEventDispatcher.java:887507

Propchange: geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerExtender.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  1 11:38:45 2010
@@ -1,2 +1,3 @@
 /geronimo/server/branches/2.2/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/WebContainerExtender.java:832538,885058
+/geronimo/server/branches/3.0-M1/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerExtender.java:948864
 /geronimo/server/trunk/plugins/j2ee/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/WebContainerExtender.java:887507

Modified: geronimo/server/trunk/plugins/welcome/welcome-jetty-server/pom.sample.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/welcome/welcome-jetty-server/pom.sample.xml?rev=950023&r1=950022&r2=950023&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/welcome/welcome-jetty-server/pom.sample.xml (original)
+++ geronimo/server/trunk/plugins/welcome/welcome-jetty-server/pom.sample.xml Tue Jun  1 11:38:45 2010
@@ -1,3 +1,19 @@
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>

Modified: geronimo/server/trunk/plugins/welcome/welcome-tomcat-server/pom.sample.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/welcome/welcome-tomcat-server/pom.sample.xml?rev=950023&r1=950022&r2=950023&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/welcome/welcome-tomcat-server/pom.sample.xml (original)
+++ geronimo/server/trunk/plugins/welcome/welcome-tomcat-server/pom.sample.xml Tue Jun  1 11:38:45 2010
@@ -1,3 +1,19 @@
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>

Propchange: geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/filtered-resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  1 11:38:45 2010
@@ -1 +1,2 @@
 /geronimo/server/branches/2.2/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/resources:832538,885058
+/geronimo/server/branches/3.0-M1/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/filtered-resources:948864

Propchange: geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/src/main/filtered-resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun  1 11:38:45 2010
@@ -1 +1,2 @@
 /geronimo/server/branches/2.2/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/src/main/resources:832538,885058
+/geronimo/server/branches/3.0-M1/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/src/main/filtered-resources:948864



Mime
View raw message