geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwo...@apache.org
Subject svn commit: r1080155 [1/2] - in /geronimo/server/branches/3.0-M2: ./ framework/ framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/ framework/configs/karaf-framework/src/main/distribution/windows-text/bin/ framework/configs/karaf-fr...
Date Thu, 10 Mar 2011 08:40:18 GMT
Author: rwonly
Date: Thu Mar 10 08:40:16 2011
New Revision: 1080155

URL: http://svn.apache.org/viewvc?rev=1080155&view=rev
Log:
GERONIMO-5847 merge in 1078438 from turnk to 3.0_M2

Added:
    geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/bundlemanager/BundleInfo.java
      - copied unchanged from r1078438, geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/bundlemanager/BundleInfo.java
    geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/bundlemanager/BundleState.java
      - copied unchanged from r1078438, geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/bundlemanager/BundleState.java
    geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/bundlemanager/BundleType.java
      - copied unchanged from r1078438, geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/bundlemanager/BundleType.java
    geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/bundlemanager/BundleUtil.java
      - copied unchanged from r1078438, geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/bundlemanager/BundleUtil.java
    geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/bundlemanager/ExtendedBundleInfo.java
      - copied unchanged from r1078438, geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/bundlemanager/ExtendedBundleInfo.java
    geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/bundlemanager/ManifestHeader.java
      - copied unchanged from r1078438, geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/bundlemanager/ManifestHeader.java
    geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/bundlemanager/PackageInfo.java
      - copied unchanged from r1078438, geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/bundlemanager/PackageInfo.java
    geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/bundlemanager/SimpleBundleInfo.java
      - copied unchanged from r1078438, geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/bundlemanager/SimpleBundleInfo.java
    geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/BundleManager.jsp
      - copied unchanged from r1078438, geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/BundleManager.jsp
    geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowManifest.jsp
      - copied unchanged from r1078438, geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowManifest.jsp
    geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowWiredBundles.jsp
      - copied unchanged from r1078438, geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/ShowWiredBundles.jsp
    geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/webapp/images/bundle_delete.png
      - copied unchanged from r1078438, geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/images/bundle_delete.png
    geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/webapp/images/bundle_refresh.png
      - copied unchanged from r1078438, geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/images/bundle_refresh.png
    geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/webapp/images/bundle_start.png
      - copied unchanged from r1078438, geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/images/bundle_start.png
    geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/webapp/images/bundle_stop.png
      - copied unchanged from r1078438, geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/images/bundle_stop.png
    geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/webapp/images/bundle_update.png
      - copied unchanged from r1078438, geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/images/bundle_update.png
    geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/webapp/images/icon_mf.png
      - copied unchanged from r1078438, geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/images/icon_mf.png
    geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/webapp/images/icon_wb.png
      - copied unchanged from r1078438, geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/images/icon_wb.png
    geronimo/server/branches/3.0-M2/plugins/console/console-portal-driver/src/main/webapp/images/ico_ariesapp_16x16.gif
      - copied unchanged from r1078438, geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/ico_ariesapp_16x16.gif
    geronimo/server/branches/3.0-M2/plugins/console/console-portal-driver/src/main/webapp/images/ico_osgibundles_16x16.gif
      - copied unchanged from r1078438, geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/images/ico_osgibundles_16x16.gif
Removed:
    geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/maximized.jsp
    geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/bundlemanager/normal.jsp
Modified:
    geronimo/server/branches/3.0-M2/   (props changed)
    geronimo/server/branches/3.0-M2/framework/   (props changed)
    geronimo/server/branches/3.0-M2/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/client
  (props changed)
    geronimo/server/branches/3.0-M2/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo
  (props changed)
    geronimo/server/branches/3.0-M2/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/shutdown
  (props changed)
    geronimo/server/branches/3.0-M2/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/client.bat
  (props changed)
    geronimo/server/branches/3.0-M2/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat
  (props changed)
    geronimo/server/branches/3.0-M2/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/shutdown.bat
  (props changed)
    geronimo/server/branches/3.0-M2/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
  (props changed)
    geronimo/server/branches/3.0-M2/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/
  (props changed)
    geronimo/server/branches/3.0-M2/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/ModuleConfigurer.java
  (props changed)
    geronimo/server/branches/3.0-M2/framework/modules/geronimo-deploy-tool/   (props changed)
    geronimo/server/branches/3.0-M2/framework/modules/geronimo-kernel/pom.xml   (props changed)
    geronimo/server/branches/3.0-M2/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/
  (props changed)
    geronimo/server/branches/3.0-M2/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundle.java
  (props changed)
    geronimo/server/branches/3.0-M2/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundleContext.java
  (props changed)
    geronimo/server/branches/3.0-M2/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockRespository.java
  (props changed)
    geronimo/server/branches/3.0-M2/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/SystemLog.java
  (props changed)
    geronimo/server/branches/3.0-M2/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/impl/Log4jService.java
  (props changed)
    geronimo/server/branches/3.0-M2/framework/modules/geronimo-rmi-loader/src/main/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImpl.java
  (props changed)
    geronimo/server/branches/3.0-M2/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/
  (props changed)
    geronimo/server/branches/3.0-M2/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanRootSupport.java
  (props changed)
    geronimo/server/branches/3.0-M2/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanSupport.java
  (props changed)
    geronimo/server/branches/3.0-M2/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DeploymentConfigurationSupport.java
  (props changed)
    geronimo/server/branches/3.0-M2/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/XmlBeanSupport.java
  (props changed)
    geronimo/server/branches/3.0-M2/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/
  (props changed)
    geronimo/server/branches/3.0-M2/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/BootActivator.java
  (props changed)
    geronimo/server/branches/3.0-M2/framework/modules/geronimo-upgrade/src/test/resources/
  (props changed)
    geronimo/server/branches/3.0-M2/plugins/   (props changed)
    geronimo/server/branches/3.0-M2/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationConfigBuilder.java
  (props changed)
    geronimo/server/branches/3.0-M2/plugins/clustering/geronimo-deploy-farm/   (props changed)
    geronimo/server/branches/3.0-M2/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilder.java
  (props changed)
    geronimo/server/branches/3.0-M2/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/ConfigurationNameBuilder.java
  (props changed)
    geronimo/server/branches/3.0-M2/plugins/clustering/geronimo-deploy-farm/src/test/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilderTest.java
  (props changed)
    geronimo/server/branches/3.0-M2/plugins/connector-1_6/   (props changed)
    geronimo/server/branches/3.0-M2/plugins/connector-1_6/connector-deployer-1_6/   (props
changed)
    geronimo/server/branches/3.0-M2/plugins/connector-1_6/geronimo-connector-builder-1_6/
  (props changed)
    geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/pom.xml
    geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/bundlemanager/BundleManagerPortlet.java
    geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml
    geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/web.xml
    geronimo/server/branches/3.0-M2/plugins/console/console-tomcat/src/main/plan/plan.xml
    geronimo/server/branches/3.0-M2/plugins/openejb/   (props changed)
    geronimo/server/branches/3.0-M2/plugins/openjpa2/geronimo-aries-jpa/src/main/java/org/apache/geronimo/aries/jpa/PersistenceBundleHelper.java
  (props changed)
    geronimo/server/branches/3.0-M2/plugins/openjpa2/geronimo-persistence-jpa20-builder/ 
 (props changed)
    geronimo/server/branches/3.0-M2/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java
  (props changed)
    geronimo/server/branches/3.0-M2/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java
  (props changed)
    geronimo/server/branches/3.0-M2/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerConstants.java
  (props changed)
    geronimo/server/branches/3.0-M2/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerEventDispatcher.java
  (props changed)
    geronimo/server/branches/3.0-M2/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerExtender.java
  (props changed)
    geronimo/server/branches/3.0-M2/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/src/main/filtered-resources/
  (props changed)
    geronimo/server/branches/3.0-M2/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/src/main/filtered-resources/
  (props changed)
    geronimo/server/branches/3.0-M2/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/filtered-resources/
  (props changed)
    geronimo/server/branches/3.0-M2/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/src/main/filtered-resources/
  (props changed)

Propchange: geronimo/server/branches/3.0-M2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:40:16 2011
@@ -1,3 +1,3 @@
 /geronimo/server/branches/2.2:832538,885058
 /geronimo/server/branches/3.0-M1:948864,951792
-/geronimo/server/trunk:1056676,1057959-1057962,1064432,1071183
+/geronimo/server/trunk:1056676,1057959-1057962,1064432,1071183,1078438

Propchange: geronimo/server/branches/3.0-M2/framework/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:40:16 2011
@@ -1,3 +1,3 @@
 /geronimo/server/branches/2.2/framework:826768,832538,885058
 /geronimo/server/branches/3.0-M1/framework:948864,951792
-/geronimo/server/trunk/framework:749113,749116-807432,809079-825588,1056676,1057959-1057962,1064432,1071183
+/geronimo/server/trunk/framework:749113,749116-807432,809079-825588,1056676,1057959-1057962,1064432,1071183,1078438

Propchange: geronimo/server/branches/3.0-M2/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/client
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:40:16 2011
@@ -1,4 +1,4 @@
 /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,951792
-/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/client:1056676,1057959-1057962,1064432,1071183
+/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/client:1056676,1057959-1057962,1064432,1071183,1078438
 /geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/karaf:749113,749116-807432,809079-825588

Propchange: geronimo/server/branches/3.0-M2/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:40:16 2011
@@ -1,4 +1,4 @@
 /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,951792
-/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo:1056676,1057959-1057962,1064432,1071183
+/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo:1056676,1057959-1057962,1064432,1071183,1078438
 /geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/karaf:749113,749116-807432,809079-825588

Propchange: geronimo/server/branches/3.0-M2/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/shutdown
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:40:16 2011
@@ -1,4 +1,4 @@
 /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,951792
 /geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/karaf:749113,749116-807432,809079-825588
-/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/shutdown:1056676,1057959-1057962,1064432,1071183
+/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/shutdown:1056676,1057959-1057962,1064432,1071183,1078438

Propchange: geronimo/server/branches/3.0-M2/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/client.bat
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:40:16 2011
@@ -1,4 +1,4 @@
 /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,951792
-/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/client.bat:1056676,1057959-1057962,1064432,1071183
+/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/client.bat:1056676,1057959-1057962,1064432,1071183,1078438
 /geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/karaf.bat:749113,749116-807432,809079-825588

Propchange: geronimo/server/branches/3.0-M2/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:40:16 2011
@@ -1,4 +1,4 @@
 /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,951792
-/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat:1056676,1057959-1057962,1064432,1071183
+/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat:1056676,1057959-1057962,1064432,1071183,1078438
 /geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/karaf.bat:749113,749116-807432,809079-825588

Propchange: geronimo/server/branches/3.0-M2/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/shutdown.bat
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:40:16 2011
@@ -1,4 +1,4 @@
 /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,951792
 /geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/karaf.bat:749113,749116-807432,809079-825588
-/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/shutdown.bat:1056676,1057959-1057962,1064432,1071183
+/geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/shutdown.bat:1056676,1057959-1057962,1064432,1071183,1078438

Propchange: geronimo/server/branches/3.0-M2/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:40:16 2011
@@ -1,2 +1,2 @@
 /geronimo/server/branches/3.0-M1/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties:948864,951792
-/geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties:809079-825588,1056676,1057959-1057962,1064432,1071183
+/geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties:809079-825588,1056676,1057959-1057962,1064432,1071183,1078438

Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:40:16 2011
@@ -1,2 +1,2 @@
 /geronimo/server/branches/3.0-M1/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi:948864,951792
-/geronimo/server/trunk/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi:749113,749116-807432,809079-825588*,1056676,1057959-1057962,1064432,1071183
+/geronimo/server/trunk/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi:749113,749116-807432,809079-825588*,1056676,1057959-1057962,1064432,1071183,1078438

Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/ModuleConfigurer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:40:16 2011
@@ -1,2 +1,2 @@
 /geronimo/server/branches/3.0-M1/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/ModuleConfigurer.java:948864,951792
-/geronimo/server/trunk/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/ModuleConfigurer.java:749113,749116-807432,809079-825588,1056676,1057959-1057962,1064432,1071183
+/geronimo/server/trunk/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/ModuleConfigurer.java:749113,749116-807432,809079-825588,1056676,1057959-1057962,1064432,1071183,1078438

Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-deploy-tool/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:40:16 2011
@@ -1,3 +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,951792
-/geronimo/server/trunk/framework/modules/geronimo-deploy-tool:749113,749116-807432,809079-825588,1056676,1057959-1057962,1064432,1071183
+/geronimo/server/trunk/framework/modules/geronimo-deploy-tool:749113,749116-807432,809079-825588,1056676,1057959-1057962,1064432,1071183,1078438

Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-kernel/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:40:16 2011
@@ -1,3 +1,3 @@
 /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,951792
-/geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml:1056676,1057959-1057962,1064432,1071183
+/geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml:1056676,1057959-1057962,1064432,1071183,1078438

Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:40:16 2011
@@ -1,2 +1,2 @@
 /geronimo/server/branches/3.0-M1/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi:948864,951792
-/geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi:749113,749116-807432,809079-825588*,1056676,1057959-1057962,1064432,1071183
+/geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi:749113,749116-807432,809079-825588*,1056676,1057959-1057962,1064432,1071183,1078438

Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundle.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:40:16 2011
@@ -1,2 +1,2 @@
 /geronimo/server/branches/3.0-M1/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundle.java:948864,951792
-/geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundle.java:749113,749116-807432,809079-825588,1056676,1057959-1057962,1064432,1071183
+/geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundle.java:749113,749116-807432,809079-825588,1056676,1057959-1057962,1064432,1071183,1078438

Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundleContext.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:40:16 2011
@@ -1,2 +1,2 @@
 /geronimo/server/branches/3.0-M1/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundleContext.java:948864,951792
-/geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundleContext.java:749113,749116-807432,809079-825588,1056676,1057959-1057962,1064432,1071183
+/geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundleContext.java:749113,749116-807432,809079-825588,1056676,1057959-1057962,1064432,1071183,1078438

Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockRespository.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:40:16 2011
@@ -1,2 +1,2 @@
 /geronimo/server/branches/3.0-M1/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockRespository.java:948864,951792
-/geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockRespository.java:749113,749116-807432,809079-825588,1056676,1057959-1057962,1064432,1071183
+/geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockRespository.java:749113,749116-807432,809079-825588,1056676,1057959-1057962,1064432,1071183,1078438

Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/SystemLog.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:40:16 2011
@@ -1,4 +1,4 @@
 /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,951792
-/geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/SystemLog.java:1056676,1057959-1057962,1064432,1071183
+/geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/SystemLog.java:1056676,1057959-1057962,1064432,1071183,1078438
 /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/branches/3.0-M2/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/impl/Log4jService.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:40:16 2011
@@ -1,4 +1,4 @@
 /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,951792
-/geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/impl/Log4jService.java:1056676,1057959-1057962,1064432,1071183
+/geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/impl/Log4jService.java:1056676,1057959-1057962,1064432,1071183,1078438
 /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/branches/3.0-M2/framework/modules/geronimo-rmi-loader/src/main/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImpl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:40:16 2011
@@ -1,3 +1,3 @@
 /geronimo/server/branches/3.0-M1/framework/modules/geronimo-rmi-loader/src/main/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImpl.java:948864,951792
 /geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImpl.java:749113,749116-807432,809079-825588
-/geronimo/server/trunk/framework/modules/geronimo-rmi-loader/src/main/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImpl.java:1056676,1057959-1057962,1064432,1071183
+/geronimo/server/trunk/framework/modules/geronimo-rmi-loader/src/main/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImpl.java:1056676,1057959-1057962,1064432,1071183,1078438

Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:40:16 2011
@@ -1,2 +1,2 @@
 /geronimo/server/branches/3.0-M1/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean:948864,951792
-/geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean:749113,749116-807432,809079-825588*,1056676,1057959-1057962,1064432,1071183
+/geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean:749113,749116-807432,809079-825588*,1056676,1057959-1057962,1064432,1071183,1078438

Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanRootSupport.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:40:16 2011
@@ -1,2 +1,2 @@
 /geronimo/server/branches/3.0-M1/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanRootSupport.java:948864,951792
-/geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanRootSupport.java:749113,749116-807432,809079-825588,1056676,1057959-1057962,1064432,1071183
+/geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanRootSupport.java:749113,749116-807432,809079-825588,1056676,1057959-1057962,1064432,1071183,1078438

Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanSupport.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:40:16 2011
@@ -1,2 +1,2 @@
 /geronimo/server/branches/3.0-M1/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanSupport.java:948864,951792
-/geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanSupport.java:749113,749116-807432,809079-825588,1056676,1057959-1057962,1064432,1071183
+/geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanSupport.java:749113,749116-807432,809079-825588,1056676,1057959-1057962,1064432,1071183,1078438

Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DeploymentConfigurationSupport.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:40:16 2011
@@ -1,2 +1,2 @@
 /geronimo/server/branches/3.0-M1/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DeploymentConfigurationSupport.java:948864,951792
-/geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DeploymentConfigurationSupport.java:749113,749116-807432,809079-825588,1056676,1057959-1057962,1064432,1071183
+/geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DeploymentConfigurationSupport.java:749113,749116-807432,809079-825588,1056676,1057959-1057962,1064432,1071183,1078438

Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/XmlBeanSupport.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:40:16 2011
@@ -1,2 +1,2 @@
 /geronimo/server/branches/3.0-M1/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/XmlBeanSupport.java:948864,951792
-/geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/XmlBeanSupport.java:749113,749116-807432,809079-825588,1056676,1057959-1057962,1064432,1071183
+/geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/XmlBeanSupport.java:749113,749116-807432,809079-825588,1056676,1057959-1057962,1064432,1071183,1078438

Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:40:16 2011
@@ -1,2 +1,2 @@
 /geronimo/server/branches/3.0-M1/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi:948864,951792
-/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi:749113,749116-807432,809079-825588*,1056676,1057959-1057962,1064432,1071183
+/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi:749113,749116-807432,809079-825588*,1056676,1057959-1057962,1064432,1071183,1078438

Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/BootActivator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:40:16 2011
@@ -1,2 +1,2 @@
 /geronimo/server/branches/3.0-M1/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/BootActivator.java:948864,951792
-/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/BootActivator.java:749113,749116-807432,809079-825588,1056676,1057959-1057962,1064432,1071183
+/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/BootActivator.java:749113,749116-807432,809079-825588,1056676,1057959-1057962,1064432,1071183,1078438

Propchange: geronimo/server/branches/3.0-M2/framework/modules/geronimo-upgrade/src/test/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:40:16 2011
@@ -1,3 +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,951792
-/geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/resources:809079-825588,1056676,1057959-1057962,1064432,1071183
+/geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/resources:809079-825588,1056676,1057959-1057962,1064432,1071183,1078438

Propchange: geronimo/server/branches/3.0-M2/plugins/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:40:16 2011
@@ -1,4 +1,4 @@
 /geronimo/server/branches/2.2/plugins:832538,885058
 /geronimo/server/branches/3.0-M1/plugins:948864,951792
-/geronimo/server/trunk/plugins:1056676,1057959-1057962,1064377,1064432-1064433,1071183
+/geronimo/server/trunk/plugins:1056676,1057959-1057962,1064377,1064432-1064433,1071183,1078438
 /geronimo/server/trunk/plugins/j2ee:887507

Propchange: geronimo/server/branches/3.0-M2/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationConfigBuilder.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:40:16 2011
@@ -1,2 +1,2 @@
 /geronimo/server/branches/3.0-M1/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationConfigBuilder.java:948864,951792
-/geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationConfigBuilder.java:1056676,1057959-1057962,1064377,1064432-1064433,1071183
+/geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationConfigBuilder.java:1056676,1057959-1057962,1064377,1064432-1064433,1071183,1078438

Propchange: geronimo/server/branches/3.0-M2/plugins/clustering/geronimo-deploy-farm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:40:16 2011
@@ -1,5 +1,5 @@
 /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,951792
-/geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm:1056676,1057959-1057962,1064377,1064432-1064433,1071183
+/geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm:1056676,1057959-1057962,1064377,1064432-1064433,1071183,1078438
 /geronimo/server/trunk/plugins/j2ee/clustering/geronimo-deploy-farm:887507

Propchange: geronimo/server/branches/3.0-M2/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilder.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:40:16 2011
@@ -1,4 +1,4 @@
 /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,951792
-/geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilder.java:1056676,1057959-1057962,1064377,1064432-1064433,1071183
+/geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilder.java:1056676,1057959-1057962,1064377,1064432-1064433,1071183,1078438

Propchange: geronimo/server/branches/3.0-M2/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/ConfigurationNameBuilder.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:40:16 2011
@@ -1,4 +1,4 @@
 /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,951792
-/geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/ConfigurationNameBuilder.java:1056676,1057959-1057962,1064377,1064432-1064433,1071183
+/geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/ConfigurationNameBuilder.java:1056676,1057959-1057962,1064377,1064432-1064433,1071183,1078438

Propchange: geronimo/server/branches/3.0-M2/plugins/clustering/geronimo-deploy-farm/src/test/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:40:16 2011
@@ -1,3 +1,3 @@
 /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,951792
-/geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/test/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilderTest.java:1056676,1057959-1057962,1064377,1064432-1064433,1071183
+/geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/test/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilderTest.java:1056676,1057959-1057962,1064377,1064432-1064433,1071183,1078438

Propchange: geronimo/server/branches/3.0-M2/plugins/connector-1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:40:16 2011
@@ -1,3 +1,3 @@
 /geronimo/server/branches/3.0-M1/plugins/connector-1_6:948864,951792
 /geronimo/server/trunk/plugins/connector:799922,803943
-/geronimo/server/trunk/plugins/connector-1_6:1056676,1057959-1057962,1064377,1064432-1064433,1071183
+/geronimo/server/trunk/plugins/connector-1_6:1056676,1057959-1057962,1064377,1064432-1064433,1071183,1078438

Propchange: geronimo/server/branches/3.0-M2/plugins/connector-1_6/connector-deployer-1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:40:16 2011
@@ -1,4 +1,4 @@
 /geronimo/server/branches/3.0-M1/plugins/connector-1_6/connector-deployer-1_6:948864,951792
 /geronimo/server/trunk/plugins/connector/connector-deployer:803943
 /geronimo/server/trunk/plugins/connector/connector-deployer-1_6:799922,803943
-/geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6:1056676,1057959-1057962,1064377,1064432-1064433,1071183
+/geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6:1056676,1057959-1057962,1064377,1064432-1064433,1071183,1078438

Propchange: geronimo/server/branches/3.0-M2/plugins/connector-1_6/geronimo-connector-builder-1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 10 08:40:16 2011
@@ -1,4 +1,4 @@
 /geronimo/server/branches/3.0-M1/plugins/connector-1_6/geronimo-connector-builder-1_6:948864,951792
 /geronimo/server/trunk/plugins/connector/geronimo-connector-builder:799922
 /geronimo/server/trunk/plugins/connector/geronimo-connector-builder-1_6:799922,803943
-/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6:1056676,1057959-1057962,1064377,1064432-1064433,1071183
+/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6:1056676,1057959-1057962,1064377,1064432-1064433,1071183,1078438

Modified: geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/pom.xml?rev=1080155&r1=1080154&r2=1080155&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/pom.xml (original)
+++ geronimo/server/branches/3.0-M2/plugins/console/console-base-portlets/pom.xml Thu Mar
10 08:40:16 2011
@@ -94,7 +94,14 @@
             <artifactId>org.apache.servicemix.bundles.commons-io</artifactId>
             <scope>provided</scope>
         </dependency>
-
+        
+        <!-- FIXME : this should be replaced by org.apache.aries.util in next release
-->
+        <dependency>
+            <groupId>org.apache.aries.application</groupId>
+            <artifactId>org.apache.aries.application.utils</artifactId>
+            <version>0.2.1</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <!-- Build configuration -->



Mime
View raw message