geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r825621 - in /geronimo/sandbox/djencks/osgi/framework: ./ buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/ configs/ configs/geronimo-boilerplate/ configs/geronimo-boilerplate/src/main/assembly/ configs/geronimo...
Date Thu, 15 Oct 2009 19:14:43 GMT
Author: djencks
Date: Thu Oct 15 19:14:41 2009
New Revision: 825621

URL: http://svn.apache.org/viewvc?rev=825621&view=rev
Log:
Merge in trunk changes through rev 825619

Modified:
    geronimo/sandbox/djencks/osgi/framework/   (props changed)
    geronimo/sandbox/djencks/osgi/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml
    geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/   (props changed)
    geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/src/main/assembly/boilerplate.xml
    geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/gserviceReg.sh
    geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/src/main/underlay/instance/var/log/server-log4j.properties
    geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/configs/gshell-geronimo/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/configs/jee-specs/pom.xml
    geronimo/sandbox/djencks/osgi/framework/configs/jee-specs/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/configs/jsr88-cli/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties   (props changed)
    geronimo/sandbox/djencks/osgi/framework/configs/pom.xml
    geronimo/sandbox/djencks/osgi/framework/configs/server-security-config/src/main/resources/security/groups.properties
    geronimo/sandbox/djencks/osgi/framework/configs/server-security-config/src/main/resources/security/users.properties
    geronimo/sandbox/djencks/osgi/framework/configs/shutdown/src/main/history/dependencies.xml
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/   (props changed)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/ModuleConfigurer.java   (props changed)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-jmx-remoting/pom.xml
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-jmx-remoting/src/main/java/org/apache/geronimo/jmxremoting/Authenticator.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-jmx-remoting/src/test/java/org/apache/geronimo/jmxremoting/AuthenticatorTest.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/basic/BasicProxyManager.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/   (props changed)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundle.java   (props changed)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundleContext.java   (props changed)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockRespository.java   (props changed)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/WebManager.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-service-builder/pom.xml
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/   (props changed)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanRootSupport.java   (props changed)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanSupport.java   (props changed)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DeploymentConfigurationSupport.java   (props changed)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/XmlBeanSupport.java   (props changed)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/   (props changed)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/BootActivator.java   (props changed)
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java
    geronimo/sandbox/djencks/osgi/framework/modules/geronimo-upgrade/src/test/resources/   (props changed)
    geronimo/sandbox/djencks/osgi/framework/plugingroups/pom.xml

Propchange: geronimo/sandbox/djencks/osgi/framework/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 15 19:14:41 2009
@@ -1 +1 @@
-/geronimo/server/trunk/framework:749113,749116-807432
+/geronimo/server/trunk/framework:749113,749116-807432,809079-825588

Modified: geronimo/sandbox/djencks/osgi/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml?rev=825621&r1=825620&r2=825621&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/buildsupport/geronimo-plugin-archetype/src/main/resources/archetype-resources/pom.xml Thu Oct 15 19:14:41 2009
@@ -21,7 +21,7 @@
         <cxfDeployer>org.apache.geronimo.configs/cxf-deployer/${geronimoVersion}/car</cxfDeployer>
         <axis2Deployer>org.apache.geronimo.configs/axis2-deployer/${geronimoVersion}/car</axis2Deployer>
         <tomcatDeployer>org.apache.geronimo.configs/tomcat6-deployer/${geronimoVersion}/car</tomcatDeployer>
-        <jettyDeployer>org.apache.geronimo.configs/${jetty}-deployer/${geronimoVersion}/car</jetty6Deployer>
+        <jettyDeployer>org.apache.geronimo.configs/${jetty}-deployer/${geronimoVersion}/car</jettyDeployer>
         <jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${geronimoVersion}/car</jasperDeployer>
         <jpaDeployer>org.apache.geronimo.configs/persistence-jpa10-deployer/${geronimoVersion}/car</jpaDeployer>
     </properties>

Propchange: geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Oct 15 19:14:41 2009
@@ -0,0 +1,2 @@
+/geronimo/server/branches/2.2/framework/configs/geronimo-boilerplate:814265
+/geronimo/server/trunk/framework/configs/geronimo-boilerplate:749113,749116-807432,809079-825588

Modified: geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/src/main/assembly/boilerplate.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/src/main/assembly/boilerplate.xml?rev=825621&r1=825620&r2=825621&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/src/main/assembly/boilerplate.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/src/main/assembly/boilerplate.xml Thu Oct 15 19:14:41 2009
@@ -27,6 +27,9 @@
         <fileSet>
             <directory>src/main/underlay</directory>
             <outputDirectory></outputDirectory>
+            <excludes>
+                <exclude>contents/etc/gsh-classworlds.conf</exclude>
+            </excludes>
         </fileSet>
     </fileSets>
 
@@ -45,6 +48,7 @@
             <includes>
                 <include>org.codehaus.plexus:plexus-classworlds</include>
             </includes>
+            <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
         
         <dependencySet>
@@ -55,6 +59,7 @@
             <includes>
                 <include>org.apache.geronimo.gshell:gshell-bootstrap</include>
             </includes>
+            <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
         
         <dependencySet>
@@ -81,6 +86,7 @@
                 <include>org.apache.geronimo.framework:geronimo-transformer</include>
                 <include>org.codehaus.plexus:plexus-archiver</include>
             </includes>
+            <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
         
         <dependencySet>
@@ -90,6 +96,7 @@
             <includes>
                 <include>org.apache.geronimo.framework:jsr88-deploymentfactory</include>
             </includes>
+            <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
 
         <dependencySet>
@@ -99,6 +106,7 @@
             <includes>
                 <include>org.apache.geronimo.framework:client-system</include>
             </includes>
+            <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
 
         <dependencySet>
@@ -108,6 +116,7 @@
             <includes>
                 <include>org.apache.geronimo.framework:j2ee-system</include>
             </includes>
+            <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
 
         <dependencySet>
@@ -117,6 +126,7 @@
             <includes>
                 <include>org.apache.geronimo.framework:shutdown</include>
             </includes>
+            <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
 
         <dependencySet>
@@ -126,6 +136,7 @@
             <includes>
                 <include>org.apache.geronimo.framework:transformer-agent</include>
             </includes>
+            <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
 
         <dependencySet>
@@ -135,6 +146,7 @@
             <includes>
                 <include>org.apache.geronimo.framework:online-deployer</include>
             </includes>
+            <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
         
         <dependencySet>
@@ -143,6 +155,7 @@
                 <include>org.apache.yoko:yoko-spec-corba</include>
                 <include>org.apache.yoko:yoko-rmi-spec</include>
             </includes>
+            <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
     </dependencySets>
 

Modified: geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/gserviceReg.sh
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/gserviceReg.sh?rev=825621&r1=825620&r2=825621&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/gserviceReg.sh (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/src/main/underlay/contents/bin/gserviceReg.sh Thu Oct 15 19:14:41 2009
@@ -135,6 +135,10 @@
 echo '# Default-Stop:      0 1 2 6'>>"$GSERVICE_NAME"
 echo "# Short-Description: $2 daemon">>"$GSERVICE_NAME"
 echo '### END INIT INFO'>>"$GSERVICE_NAME"
+if $osUbuntu; then
+ echo ". /lib/lsb/init-functions" >>"$GSERVICE_NAME"
+ echo "user=$USER" >>"$GSERVICE_NAME"
+fi
 echo "JAVA_HOME=$JAVA_HOME">>"$GSERVICE_NAME"
 echo "export JAVA_HOME">>"$GSERVICE_NAME"
 echo "GERONIMO_HOME=$GERONIMO_HOME">>"$GSERVICE_NAME"
@@ -155,15 +159,26 @@
 echo '}'>>"$GSERVICE_NAME"
 echo 'else  '>>"$GSERVICE_NAME"
 echo '{'>>"$GSERVICE_NAME"
+if $osUbuntu; then 
+echo 'log_daemon_msg "Starting Server"'>>"$GSERVICE_NAME"
+echo 'JAVA_HOME="$JAVA_HOME" start-stop-daemon --make-pidfile --pidfile /var/run/geronimo-server.pid --background --user $user --exec "$GERONIMO_HOME"/bin/geronimo.sh --start -- run'>>"$GSERVICE_NAME"
+else
 echo 'echo "Start Server on port $RMI_PORT"'>>"$GSERVICE_NAME"
 echo ' "$GERONIMO_HOME"/bin/startup.sh'>>"$GSERVICE_NAME"
+fi
 echo '}'>>"$GSERVICE_NAME"
 echo 'fi'>>"$GSERVICE_NAME"
 echo '}'>>"$GSERVICE_NAME"
 
+
 echo 'stop() {'>>"$GSERVICE_NAME"
+if $osUbuntu; then
+ echo 'log_daemon_msg "Stopping Server"'>>"$GSERVICE_NAME"
+ echo 'killproc -p /var/run/geronimo-server.pid || true'>>"$GSERVICE_NAME"
+else
 echo 'echo "Shutting down server on port ${RMI_PORT}"'>>"$GSERVICE_NAME"
 echo '"$GERONIMO_HOME"/bin/shutdown.sh --user "$ADMIN_USER" --password "$ADMIN_PASS" --port "$RMI_PORT"'>>"$GSERVICE_NAME"
+fi
 echo '}'>>"$GSERVICE_NAME"
 
 echo 'restart() {'>>"$GSERVICE_NAME"
@@ -216,8 +231,13 @@
 
 chmod +x "$GSERVICE_NAME"
 if [ ! -x /usr/sbin/$2 ]; then
-  ln -sf "$GSERVICE_NAME" /usr/sbin/"$2"
-  chmod +x /usr/sbin/"$2"
+  if $osUbuntu; then
+   sudo ln -sf "$GSERVICE_NAME" /usr/sbin/"$2"
+   sudo chmod +x /usr/sbin/"$2"
+  else
+   ln -sf "$GSERVICE_NAME" /usr/sbin/"$2"
+   chmod +x /usr/sbin/"$2"
+  fi
  if $osSuse; then  
   ln -sf /usr/sbin/"$2" /etc/init.d/"$2"
   insserv "$2"
@@ -234,8 +254,8 @@
    echo "$2:2:respawn:/usr/sbin/$2 start">>/etc/inittab
  fi 
  if $osUbuntu; then    
-   ln -sf /usr/sbin/"$2" /etc/init.d/"$2"
-   update-rc.d $2 defaults 99 01   
+   sudo ln -sf /usr/sbin/"$2" /etc/init.d/"$2"
+   sudo update-rc.d $2 defaults   
  fi
 else
 echo "$2 already exists"
@@ -254,11 +274,12 @@
   rm -f /etc/init.d/"$2"  
  fi
  if $osSolaris; then   
-   rm -fr /etc/rc3.d/S99"$2"
+   rm -fr /etc/rc3.d/S99"$2"   
  fi
  if $osUbuntu; then    
-   update-rc.d -f $2 remove
-   rm -f /etc/init.d/"$2"   
+   sudo update-rc.d -f $2 remove
+   sudo rm -f /etc/init.d/"$2"
+   sudo rm -f /usr/sbin/$2 
  fi
  rm -f /usr/sbin/$2
  rm -f "$GSERVICE_NAME" 

Modified: geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/src/main/underlay/instance/var/log/server-log4j.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/src/main/underlay/instance/var/log/server-log4j.properties?rev=825621&r1=825620&r2=825621&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/src/main/underlay/instance/var/log/server-log4j.properties (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/geronimo-boilerplate/src/main/underlay/instance/var/log/server-log4j.properties Thu Oct 15 19:14:41 2009
@@ -120,11 +120,20 @@
 # Prints various stuff when the portal is used
 log4j.logger.org.apache.pluto.portalImpl.Servlet=WARN
 
+# Prints various stuff when registering portlets for context
+log4j.logger.org.apache.pluto.core.PortletContextManager=WARN
+
 # Prints stuff for AJAX calls
 log4j.logger.uk.ltd.getahead.dwr.impl.DefaultConfiguration=WARN
 log4j.logger.uk.ltd.getahead.dwr.impl.ExecuteQuery=WARN
 log4j.logger.uk.ltd.getahead.dwr.util.Logger=WARN
 
+# Prints various stuff when loading mapping descriptors in pluto
+log4j.logger.org.exolab.castor.mapping.Mapping=WARN
+
+# Prints various stuff when filtering the requests.
+log4j.logger.org.apache.geronimo.console.filter.XSRFHandler=WARN
+
 # Example: enable Axis debug log output
 #log4j.logger.org.apache.axis.enterprise=DEBUG
 #log4j.logger.org.apache.axis.TIME=DEBUG

Modified: geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml?rev=825621&r1=825620&r2=825621&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer-bootstrap/src/main/history/dependencies.xml Thu Oct 15 19:14:41 2009
@@ -72,6 +72,11 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
         <type>jar</type>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml?rev=825621&r1=825620&r2=825621&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/geronimo-gbean-deployer/src/main/history/dependencies.xml Thu Oct 15 19:14:41 2009
@@ -57,6 +57,11 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
         <type>jar</type>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/gshell-geronimo/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/gshell-geronimo/src/main/history/dependencies.xml?rev=825621&r1=825620&r2=825621&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/gshell-geronimo/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/gshell-geronimo/src/main/history/dependencies.xml Thu Oct 15 19:14:41 2009
@@ -122,6 +122,11 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
         <type>jar</type>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/jee-specs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/jee-specs/pom.xml?rev=825621&r1=825620&r2=825621&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/jee-specs/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/jee-specs/pom.xml Thu Oct 15 19:14:41 2009
@@ -114,7 +114,7 @@
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jpa_1.0_spec</artifactId>
+            <artifactId>geronimo-jpa_2.0_spec</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/jee-specs/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/jee-specs/src/main/history/dependencies.xml?rev=825621&r1=825620&r2=825621&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/jee-specs/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/jee-specs/src/main/history/dependencies.xml Thu Oct 15 19:14:41 2009
@@ -103,7 +103,7 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jpa_1.0_spec</artifactId>
+        <artifactId>geronimo-jpa_2.0_spec</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/jsr88-cli/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/jsr88-cli/src/main/history/dependencies.xml?rev=825621&r1=825620&r2=825621&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/jsr88-cli/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/jsr88-cli/src/main/history/dependencies.xml Thu Oct 15 19:14:41 2009
@@ -92,6 +92,11 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
         <type>jar</type>

Propchange: geronimo/sandbox/djencks/osgi/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 15 19:14:41 2009
@@ -0,0 +1 @@
+/geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties:809079-825588

Modified: geronimo/sandbox/djencks/osgi/framework/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/pom.xml?rev=825621&r1=825620&r2=825621&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/pom.xml Thu Oct 15 19:14:41 2009
@@ -82,9 +82,9 @@
                             <jvm-version>1.5</jvm-version>
                             <jvm-version>1.6</jvm-version>
                             <!--<source-repository>http://www.geronimoplugins.com/repository/geronimo-2.1</source-repository>-->
-                            <source-repository>~/.m2/repository/</source-repository>
-                            <source-repository>http://repo1.maven.org/maven2/</source-repository>
-                            <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
+                            <source-repository>${PluginSrcRepoLocal}</source-repository>
+                            <source-repository>${PluginSrcRepoCentral}</source-repository>
+                            <source-repository>${PluginSrcRepoApacheSnapshots}</source-repository>
                             <artifact-alias key="${groupId}/${artifactId}//car">${groupId}/${artifactId}/${version}/car</artifact-alias>
                         </plugin-artifact>
                     </commonInstance>

Modified: geronimo/sandbox/djencks/osgi/framework/configs/server-security-config/src/main/resources/security/groups.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/server-security-config/src/main/resources/security/groups.properties?rev=825621&r1=825620&r2=825621&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/server-security-config/src/main/resources/security/groups.properties (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/server-security-config/src/main/resources/security/groups.properties Thu Oct 15 19:14:41 2009
@@ -15,3 +15,4 @@
 #  limitations under the License.
 #=====================================================================
 admin=system
+monitor=monitor

Modified: geronimo/sandbox/djencks/osgi/framework/configs/server-security-config/src/main/resources/security/users.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/server-security-config/src/main/resources/security/users.properties?rev=825621&r1=825620&r2=825621&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/server-security-config/src/main/resources/security/users.properties (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/server-security-config/src/main/resources/security/users.properties Thu Oct 15 19:14:41 2009
@@ -15,3 +15,4 @@
 #  limitations under the License.
 #=====================================================================
 system=manager
+monitor=password

Modified: geronimo/sandbox/djencks/osgi/framework/configs/shutdown/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/configs/shutdown/src/main/history/dependencies.xml?rev=825621&r1=825620&r2=825621&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/configs/shutdown/src/main/history/dependencies.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/configs/shutdown/src/main/history/dependencies.xml Thu Oct 15 19:14:41 2009
@@ -92,6 +92,11 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>org.apache.servicemix.bundles.cglib</artifactId>
         <type>jar</type>

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Oct 15 19:14:41 2009
@@ -0,0 +1 @@
+/geronimo/server/trunk/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi:749113,749116-807432,809079-825588*

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/ModuleConfigurer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Oct 15 19:14:41 2009
@@ -0,0 +1 @@
+/geronimo/server/trunk/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/ModuleConfigurer.java:749113,749116-807432,809079-825588

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-jmx-remoting/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-jmx-remoting/pom.xml?rev=825621&r1=825620&r2=825621&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-jmx-remoting/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-jmx-remoting/pom.xml Thu Oct 15 19:14:41 2009
@@ -47,6 +47,11 @@
             <artifactId>geronimo-system</artifactId>
             <version>${version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.framework</groupId>
+            <artifactId>geronimo-security</artifactId>
+            <version>${version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -71,3 +76,4 @@
     
 </project>
 
+

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-jmx-remoting/src/main/java/org/apache/geronimo/jmxremoting/Authenticator.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-jmx-remoting/src/main/java/org/apache/geronimo/jmxremoting/Authenticator.java?rev=825621&r1=825620&r2=825621&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-jmx-remoting/src/main/java/org/apache/geronimo/jmxremoting/Authenticator.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-jmx-remoting/src/main/java/org/apache/geronimo/jmxremoting/Authenticator.java Thu Oct 15 19:14:41 2009
@@ -16,17 +16,20 @@
  */
 package org.apache.geronimo.jmxremoting;
 
-import java.util.Map;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import javax.management.Notification;
+import javax.management.NotificationListener;
 import javax.management.remote.JMXAuthenticator;
 import javax.management.remote.JMXConnectionNotification;
-import javax.management.NotificationListener;
-import javax.management.Notification;
 import javax.security.auth.Subject;
 import javax.security.auth.login.LoginContext;
 import javax.security.auth.login.LoginException;
 
+import org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal;
 /**
  * JMX Authenticator that checks the Credentials by logging in via JAAS.
  *
@@ -67,6 +70,18 @@
             LoginContext context = new LoginContext(configName, credentials);
             context.login();
             threadContext.set(context);
+            Subject sub = context.getSubject();
+            Set<GeronimoGroupPrincipal> pricipalsGroup = sub.getPrincipals(GeronimoGroupPrincipal.class);
+            boolean isInAdminGroup = false;
+            for (GeronimoGroupPrincipal principal : pricipalsGroup) {
+                if (principal.getName().equals("admin")) {
+                    isInAdminGroup = true;
+                    break;
+                 }
+            }
+            if(!isInAdminGroup){
+                throw new LoginException("Only users in admin group are allowed");
+            }
             return context.getSubject();
         } catch (LoginException e) {
             // do not propogate cause - we don't know what information is may contain

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-jmx-remoting/src/test/java/org/apache/geronimo/jmxremoting/AuthenticatorTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-jmx-remoting/src/test/java/org/apache/geronimo/jmxremoting/AuthenticatorTest.java?rev=825621&r1=825620&r2=825621&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-jmx-remoting/src/test/java/org/apache/geronimo/jmxremoting/AuthenticatorTest.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-jmx-remoting/src/test/java/org/apache/geronimo/jmxremoting/AuthenticatorTest.java Thu Oct 15 19:14:41 2009
@@ -18,8 +18,10 @@
 
 import java.security.Principal;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
+
 import javax.security.auth.Subject;
 import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;
@@ -28,12 +30,14 @@
 import javax.security.auth.callback.UnsupportedCallbackException;
 import javax.security.auth.login.AppConfigurationEntry;
 import javax.security.auth.login.Configuration;
-import javax.security.auth.login.LoginException;
 import javax.security.auth.login.FailedLoginException;
+import javax.security.auth.login.LoginException;
 import javax.security.auth.spi.LoginModule;
 
 import junit.framework.TestCase;
 
+import org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal;
+
 /**
  * 
  * 
@@ -43,6 +47,9 @@
     private static final String CONFIG_NAME = "testConfig";
     private Configuration oldConfiguration;
     private Authenticator authenticator;
+    public void testMonitorGroupLogin() throws Exception {
+        testFailure("monitor", "monitor");
+    }
 
     public void testLogin() {
         try {
@@ -137,6 +144,16 @@
         private CallbackHandler handler;
         private Map options;
         private String username;
+        private static Map<String, Set<String>> userGroupsMap = new HashMap<String, Set<String>>();
+        static {
+            Set<String> systemGroupsSet = new HashSet<String>();
+            systemGroupsSet.add("admin");
+            systemGroupsSet.add("monitor");
+            userGroupsMap.put("system", systemGroupsSet);
+            Set<String> monitorGroupsSet = new HashSet<String>();
+            monitorGroupsSet.add("monitor");
+            userGroupsMap.put("monitor", monitorGroupsSet);
+        }
 
         public void initialize(Subject subject, CallbackHandler callbackHandler, Map sharedState, Map options) {
             this.subject = subject;
@@ -167,6 +184,10 @@
 
         public boolean commit() throws LoginException {
             subject.getPrincipals().add(new MockPrincipal(username));
+            for (String groupName : userGroupsMap.get(username)) {
+                subject.getPrincipals().add(
+                    new GeronimoGroupPrincipal(groupName));
+            }
             return true;
         }
 

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java?rev=825621&r1=825620&r2=825621&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/gbean/runtime/GBeanInstance.java Thu Oct 15 19:14:41 2009
@@ -1082,7 +1082,7 @@
                         } catch (Throwable e) {
                             // There is no reason to create a new Exception sub class as this exception will
                             // simply be caught and logged on GBeanInstanceState
-                            throw new Exception("Problem while updaing the persistent value of attibute: " +
+                            throw new Exception("Problem while updating the persistent value of attibute: " +
                                     "Attribute Name: " + attribute.getName() + ", " +
                                     "Type: " + attribute.getType() + ", " +
                                     "GBeanInstance: " + getName(), e);

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/basic/BasicProxyManager.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/basic/BasicProxyManager.java?rev=825621&r1=825620&r2=825621&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/basic/BasicProxyManager.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/basic/BasicProxyManager.java Thu Oct 15 19:14:41 2009
@@ -209,22 +209,24 @@
 
             Callback callback = getMethodInterceptor(proxyType, kernel, target);
 
-            Enhancer.registerCallbacks(proxyType, new Callback[]{callback});
             try {
+                Enhancer.registerCallbacks(proxyType, new Callback[]{callback});
                 Object proxy = fastClass.newInstance();
                 interceptors.put(proxy, callback);
                 return proxy;
             } catch (InvocationTargetException e) {
                 Throwable cause = e.getCause();
                 if (cause instanceof RuntimeException) {
-                  throw (RuntimeException) cause;
+                    throw (RuntimeException) cause;
                 } else  if (cause instanceof Error) {
-                  throw (Error) cause;
+                    throw (Error) cause;
                 } else if (cause != null) {
-                  throw new ProxyCreationException(cause);
+                    throw new ProxyCreationException(cause);
                 } else {
-                  throw new ProxyCreationException(e);
+                    throw new ProxyCreationException(e);
                 }
+            } finally {
+                Enhancer.registerCallbacks(proxyType, null);
             }
         }
     }

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Oct 15 19:14:41 2009
@@ -0,0 +1 @@
+/geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi:749113,749116-807432,809079-825588*

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundle.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Oct 15 19:14:41 2009
@@ -0,0 +1 @@
+/geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundle.java:749113,749116-807432,809079-825588

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundleContext.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Oct 15 19:14:41 2009
@@ -0,0 +1 @@
+/geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundleContext.java:749113,749116-807432,809079-825588

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockRespository.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Oct 15 19:14:41 2009
@@ -0,0 +1 @@
+/geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockRespository.java:749113,749116-807432,809079-825588

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/WebManager.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/WebManager.java?rev=825621&r1=825620&r2=825621&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/WebManager.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-management/src/main/java/org/apache/geronimo/management/geronimo/WebManager.java Thu Oct 15 19:14:41 2009
@@ -49,6 +49,8 @@
     AbstractName getConnectorConfiguration(ConnectorType connectorType, List<ConnectorAttribute> connectorAttributes, WebContainer container, String uniqueName);
 
     ConnectorType getConnectorType(AbstractName connectorName);
+    
+    void updateConnectorConfig(AbstractName connectorName) throws Exception;
 
     public class ConnectorType {
         private final String description;

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-service-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-service-builder/pom.xml?rev=825621&r1=825620&r2=825621&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-service-builder/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-service-builder/pom.xml Thu Oct 15 19:14:41 2009
@@ -89,20 +89,6 @@
                 </configuration>
             </plugin>
 
-            <!--
-            HACK: Copy XmlBeans generated schemas.
-            -->
-            <!--<plugin>-->
-                <!--<groupId>org.apache.geronimo.buildsupport</groupId>-->
-                <!--<artifactId>buildsupport-maven-plugin</artifactId>-->
-                <!--<executions>-->
-                    <!--<execution>-->
-                        <!--<goals>-->
-                            <!--<goal>copy-xmlbeans-schemas</goal>-->
-                        <!--</goals>-->
-                    <!--</execution>-->
-                <!--</executions>-->
-            <!--</plugin>-->
         </plugins>
     </build>
 

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Oct 15 19:14:41 2009
@@ -0,0 +1 @@
+/geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean:749113,749116-807432,809079-825588*

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanRootSupport.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Oct 15 19:14:41 2009
@@ -0,0 +1 @@
+/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/sandbox/djencks/osgi/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanSupport.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Oct 15 19:14:41 2009
@@ -0,0 +1 @@
+/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/sandbox/djencks/osgi/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DeploymentConfigurationSupport.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Oct 15 19:14:41 2009
@@ -0,0 +1 @@
+/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/sandbox/djencks/osgi/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/XmlBeanSupport.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Oct 15 19:14:41 2009
@@ -0,0 +1 @@
+/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/sandbox/djencks/osgi/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Oct 15 19:14:41 2009
@@ -0,0 +1 @@
+/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi:749113,749116-807432,809079-825588*

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/BootActivator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Oct 15 19:14:41 2009
@@ -0,0 +1 @@
+/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/BootActivator.java:749113,749116-807432,809079-825588

Modified: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java?rev=825621&r1=825620&r2=825621&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java (original)
+++ geronimo/sandbox/djencks/osgi/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/resolver/ExplicitDefaultArtifactResolver.java Thu Oct 15 19:14:41 2009
@@ -102,8 +102,8 @@
         for (Map.Entry<Object, Object> entry : properties.entrySet()) {
             String key = (String) entry.getKey();
             String resolvedString = (String) entry.getValue();
-            Artifact source = Artifact.createPartial(key);
-            Artifact resolved = Artifact.create(resolvedString);
+            Artifact source = Artifact.createPartial(key.trim());
+            Artifact resolved = Artifact.create(resolvedString.trim());
             explicitResolution.put(source, resolved);
         }
         return explicitResolution;

Propchange: geronimo/sandbox/djencks/osgi/framework/modules/geronimo-upgrade/src/test/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 15 19:14:41 2009
@@ -0,0 +1 @@
+/geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/resources:809079-825588

Modified: geronimo/sandbox/djencks/osgi/framework/plugingroups/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/djencks/osgi/framework/plugingroups/pom.xml?rev=825621&r1=825620&r2=825621&view=diff
==============================================================================
--- geronimo/sandbox/djencks/osgi/framework/plugingroups/pom.xml (original)
+++ geronimo/sandbox/djencks/osgi/framework/plugingroups/pom.xml Thu Oct 15 19:14:41 2009
@@ -58,9 +58,9 @@
                             <geronimo-version>${geronimoVersion}</geronimo-version>
                             <jvm-version>1.5</jvm-version>
                             <jvm-version>1.6</jvm-version>
-                            <source-repository>~/.m2/repository/</source-repository>
-                            <source-repository>http://repo1.maven.org/maven2/</source-repository>
-                            <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
+                            <source-repository>${PluginSrcRepoLocal}</source-repository>
+                            <source-repository>${PluginSrcRepoCentral}</source-repository>
+                            <source-repository>${PluginSrcRepoApacheSnapshots}</source-repository>
                         </plugin-artifact>
                     </commonInstance>
                 </configuration>



Mime
View raw message