geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r1486260 [1/4] - in /geronimo/devtools/eclipse-plugin/branches/3.0: ./ assembly/ features/org.apache.geronimo.v30.feature/ plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/META-INF/ plugins/org.apache.geronimo.jaxbmodel.common/META-INF/ plugi...
Date Sat, 25 May 2013 00:27:07 GMT
Author: xiaming
Date: Sat May 25 00:27:05 2013
New Revision: 1486260

URL: http://svn.apache.org/r1486260
Log:
GERONIMODEVTOOLS-811 Merge revision r1360708-1478440 from eclipse-plugin trunk

Added:
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/FilteredClassResourceDelta.java
      - copied unchanged from r1478440, geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/FilteredClassResourceDelta.java
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/HotCodeReplaceListener.java
      - copied unchanged from r1478440, geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/HotCodeReplaceListener.java
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/internal/RemovedModuleHelper.java
      - copied unchanged from r1478440, geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/internal/RemovedModuleHelper.java
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/util/ConfigSubstitutionsHelper.java
      - copied unchanged from r1478440, geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/util/ConfigSubstitutionsHelper.java
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/util/JMXKernel.java
      - copied unchanged from r1478440, geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/util/JMXKernel.java
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/NumericVerifyListener.java
      - copied unchanged from r1478440, geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/NumericVerifyListener.java
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/commands/CheckSetPropertyCommand.java
      - copied unchanged from r1478440, geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/commands/CheckSetPropertyCommand.java
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/commands/SetPropertyCommand.java
      - copied unchanged from r1478440, geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/commands/SetPropertyCommand.java
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/commands/TextSetPropertyCommand.java
      - copied unchanged from r1478440, geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/commands/TextSetPropertyCommand.java
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/PortEditor.java
      - copied unchanged from r1478440, geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/PortEditor.java
Removed:
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/commands/SetCleanOSGiBundleCacheCommand.java
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/commands/SetHTTPPortCommand.java
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/commands/SetKarafShellCommand.java
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/commands/SetKarafShellKeepAliveCommand.java
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/commands/SetKarafShellPortCommand.java
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/commands/SetKarafShellTimeoutCommand.java
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/commands/SetNoRedeployCommand.java
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/commands/SetPasswordCommand.java
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/commands/SetRMIPortCommand.java
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/commands/SetRefreshOSGiBundleCommand.java
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/commands/SetServerInstancePropertyCommand.java
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/commands/SetUsernameCommand.java
Modified:
    geronimo/devtools/eclipse-plugin/branches/3.0/   (props changed)
    geronimo/devtools/eclipse-plugin/branches/3.0/NOTICE.txt
    geronimo/devtools/eclipse-plugin/branches/3.0/assembly/pom.xml
    geronimo/devtools/eclipse-plugin/branches/3.0/features/org.apache.geronimo.v30.feature/NOTICE.txt
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.jaxbmodel.common/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.jee.v21.jaxbmodel/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.jee.v22.jaxbmodel/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v11/LICENSE.txt
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v11/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v11/NOTICE.txt
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v20/LICENSE.txt
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v20/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v20/NOTICE.txt
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v21/LICENSE.txt
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v21/NOTICE.txt
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v22/LICENSE.txt
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v22/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v22/NOTICE.txt
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v30/LICENSE.txt
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v30/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v30/NOTICE.txt
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.core/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.schemas/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.ui/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v11.core/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v11.schemas/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v11.ui/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v20.core/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v20.ui/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v21.core/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v21.ui/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v22.core/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v22.ui/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.core/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.core/NOTICE.txt
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/Activator.java
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/DeploymentUtils.java
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoLaunchConfigurationDelegate.java
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoRuntimeDelegate.java
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerBehaviourDelegate.java
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerDelegate.java
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoServerRuntimeTargetHandler.java
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/ModuleArtifactMapper.java
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/internal/Trace.java
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/osgi/AriesHelper.java
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/util/Utils.java
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.jaxbmodel/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.jaxbmodel/NOTICE.txt
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.ui/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.ui/NOTICE.txt
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/actions/LaunchGeronimoConsoleAction.java
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/commands/ServerCommand.java
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/commands/SetPublishTimeoutCommand.java
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/GeronimoRuntimeWizardFragment.java
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/GeronimoServerWizardFragment.java
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/Messages.java
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/Messages.properties
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ServerEditorCleanOSGiBundleCacheSection.java
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ServerEditorKarafShellSection.java
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ServerEditorPortsSection.java
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ServerEditorPublishAdvancedSection.java
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ServerEditorSecuritySection.java
    geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/sections/ServerEditorStartupSection.java
    geronimo/devtools/eclipse-plugin/branches/3.0/pom.xml
    geronimo/devtools/eclipse-plugin/branches/3.0/testsuite/eclipse/pom.xml
    geronimo/devtools/eclipse-plugin/branches/3.0/testsuite/launcher/pom.xml
    geronimo/devtools/eclipse-plugin/branches/3.0/testsuite/plugins/org.apache.geronimo.testsuite.common/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/3.0/testsuite/plugins/org.apache.geronimo.testsuite.common/pom.xml
    geronimo/devtools/eclipse-plugin/branches/3.0/testsuite/plugins/org.apache.geronimo.testsuite.v20/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/3.0/testsuite/plugins/org.apache.geronimo.testsuite.v20/pom.xml
    geronimo/devtools/eclipse-plugin/branches/3.0/testsuite/plugins/org.apache.geronimo.testsuite.v21/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/3.0/testsuite/plugins/org.apache.geronimo.testsuite.v21/pom.xml
    geronimo/devtools/eclipse-plugin/branches/3.0/testsuite/plugins/org.apache.geronimo.testsuite.v22/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/3.0/testsuite/plugins/org.apache.geronimo.testsuite.v22/pom.xml
    geronimo/devtools/eclipse-plugin/branches/3.0/testsuite/plugins/org.apache.geronimo.testsuite.v30/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/3.0/testsuite/plugins/org.apache.geronimo.testsuite.v30/pom.xml
    geronimo/devtools/eclipse-plugin/branches/3.0/testsuite/plugins/pom.xml
    geronimo/devtools/eclipse-plugin/branches/3.0/testsuite/pom.xml
    geronimo/devtools/eclipse-plugin/branches/3.0/testsuite/server/pom.xml

Propchange: geronimo/devtools/eclipse-plugin/branches/3.0/
------------------------------------------------------------------------------
  Merged /geronimo/devtools/eclipse-plugin/trunk:r1360708-1478440

Modified: geronimo/devtools/eclipse-plugin/branches/3.0/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0/NOTICE.txt?rev=1486260&r1=1486259&r2=1486260&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0/NOTICE.txt (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0/NOTICE.txt Sat May 25 00:27:05 2013
@@ -1,5 +1,5 @@
 Apache Geronimo 
-Copyright 2003-2011 The Apache Software Foundation
+Copyright 2003-2013 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).

Modified: geronimo/devtools/eclipse-plugin/branches/3.0/assembly/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0/assembly/pom.xml?rev=1486260&r1=1486259&r2=1486260&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0/assembly/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0/assembly/pom.xml Sat May 25 00:27:05 2013
@@ -17,44 +17,43 @@
   -->
 <!-- $Rev$ $Date$ -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-                        
+
     <modelVersion>4.0.0</modelVersion>
-                        
+
     <groupId>org.apache.geronimo.devtools</groupId>
     <artifactId>assembly</artifactId>
     <version>3.0.1-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Geronimo Eclipse Plugin :: Assembly</name>
-                        
+
     <parent>
         <groupId>org.apache.geronimo.devtools</groupId>
         <artifactId>geronimo-eclipse-plugin</artifactId>
         <version>3.0.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-                        
+
     <build>
         <plugins>
-			<plugin>
-				<groupId>com.google.code.maven-replacer-plugin</groupId>
-				<artifactId>maven-replacer-plugin</artifactId>
-				<executions>                
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>replace</goal>
-						</goals>
-					</execution>
-				</executions>
-				<configuration>
-					<regex>false</regex>
-					<file>src/main/assembly/site.xml</file>
-					<token>($featureVersion)</token>
-					<value>${osgi.pom.version}</value>
-					<outputFile>target/resources/site.xml</outputFile>
-				</configuration>
-			</plugin>
-
+            <plugin>
+                <groupId>com.google.code.maven-replacer-plugin</groupId>
+                <artifactId>maven-replacer-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>replace</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <regex>false</regex>
+                    <file>src/main/assembly/site.xml</file>
+                    <token>($featureVersion)</token>
+                    <value>${osgi.pom.version}</value>
+                    <outputFile>target/resources/site.xml</outputFile>
+                </configuration>
+            </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -63,25 +62,24 @@
                     <execution>
                         <id>prepare</id>
                         <configuration>
-                          <finalName>geronimo-eclipse-plugin</finalName>
-                          <descriptors>
-                            <descriptor>src/main/assembly/prepare.xml</descriptor>
-                          </descriptors>
+                            <finalName>geronimo-eclipse-plugin</finalName>
+                            <descriptors>
+                                <descriptor>src/main/assembly/prepare.xml</descriptor>
+                            </descriptors>
                         </configuration>
                         <phase>prepare-package</phase>
                         <goals>
                             <goal>single</goal>
                         </goals>
                     </execution>
-
                     <execution>
                         <id>assemble</id>
                         <configuration>
-                          <finalName>geronimo-eclipse-plugin-${project.parent.version}</finalName>
-                          <descriptors>
-                            <descriptor>src/main/assembly/p2repo.xml</descriptor>
-                            <descriptor>src/main/assembly/deployable.xml</descriptor>
-                          </descriptors>
+                            <finalName>geronimo-eclipse-plugin-${project.parent.version}</finalName>
+                            <descriptors>
+                                <descriptor>src/main/assembly/p2repo.xml</descriptor>
+                                <descriptor>src/main/assembly/deployable.xml</descriptor>
+                            </descriptors>
                         </configuration>
                         <phase>package</phase>
                         <goals>
@@ -90,6 +88,7 @@
                     </execution>
                 </executions>
             </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
@@ -99,24 +98,22 @@
                         <phase>prepare-package</phase>
                         <configuration>
                             <tasks>
-                              <move todir="${basedir}/target/geronimo-eclipse-plugin-base">
-                                <fileset dir="${basedir}/target/geronimo-eclipse-plugin-base">
-                                  <include name="**/*-*.jar" />
-                                </fileset>
-                                <regexpmapper from="^(.*)${pom.version}(.*)$$" to="\1${osgi.pom.version}\2" />
-                              </move>
-
-                              <taskdef resource="net/sf/antcontrib/antlib.xml" classpathref="maven.plugin.classpath" />
-
-                              <for param="file">
-                                  <fileset dir="${basedir}/target/geronimo-eclipse-plugin-base">
-                                      <include name="features/*.jar" />
-                                  </fileset>
-                                  <sequential>
-                                      <basename property="jar.filename" file="@{file}" />
-                                      <unzip src="@{file}" dest="${basedir}/target/geronimo-eclipse-plugin-base/features-unpacked/${jar.filename}" />
-                                  </sequential>
-                              </for>
+                                <move todir="${basedir}/target/geronimo-eclipse-plugin-base">
+                                    <fileset dir="${basedir}/target/geronimo-eclipse-plugin-base">
+                                        <include name="**/*-*.jar"/>
+                                    </fileset>
+                                    <regexpmapper from="^(.*)${pom.version}(.*)$$" to="\1${osgi.pom.version}\2"/>
+                                </move>
+                                <taskdef resource="net/sf/antcontrib/antlib.xml" classpathref="maven.plugin.classpath"/>
+                                <for param="file">
+                                    <fileset dir="${basedir}/target/geronimo-eclipse-plugin-base">
+                                        <include name="features/*.jar"/>
+                                    </fileset>
+                                    <sequential>
+                                        <basename property="jar.filename" file="@{file}"/>
+                                        <unzip src="@{file}" dest="${basedir}/target/geronimo-eclipse-plugin-base/features-unpacked/${jar.filename}"/>
+                                    </sequential>
+                                </for>
                             </tasks>
                         </configuration>
                         <goals>
@@ -129,23 +126,23 @@
                         <phase>package</phase>
                         <configuration>
                             <tasks>
-                                <property name="assembly.dir" value="${basedir}/target/p2-tmp" />
-                                <property name="input.zip" value="${basedir}/target/geronimo-eclipse-plugin-${project.parent.version}-p2repo.zip" />
-                                <property name="output.zip" value="${input.zip}" />
-                                <mkdir dir="${assembly.dir}" />
-                                <makeurl property="assembly.dir.url" file="${assembly.dir}" />
-                                <unzip src="${input.zip}" dest="${assembly.dir}" />
-                                <copy file="${basedir}/target/resources/site.xml" todir="${assembly.dir}" />
+                                <property name="assembly.dir" value="${basedir}/target/p2-tmp"/>
+                                <property name="input.zip" value="${basedir}/target/geronimo-eclipse-plugin-${project.parent.version}-p2repo.zip"/>
+                                <property name="output.zip" value="${input.zip}"/>
+                                <mkdir dir="${assembly.dir}"/>
+                                <makeurl property="assembly.dir.url" file="${assembly.dir}"/>
+                                <unzip src="${input.zip}" dest="${assembly.dir}"/>
+                                <copy file="${basedir}/target/resources/site.xml" todir="${assembly.dir}"/>
                                 <java fork="true" classname="org.eclipse.equinox.launcher.Main">
                                     <classpath>
-                                        <fileset file="${eclipseInstall}/eclipse/plugins/org.eclipse.equinox.launcher_*.jar" />
+                                        <fileset file="${eclipseInstall}/eclipse/plugins/org.eclipse.equinox.launcher_*.jar"/>
                                     </classpath>
-                                    <arg line="-application org.eclipse.equinox.p2.publisher.UpdateSitePublisher" />
-                                    <arg line="-metadataRepository ${assembly.dir.url}" />  
-                                    <arg line="-artifactRepository ${assembly.dir.url}" />
-                                    <arg line="-source ${assembly.dir}" />
+                                    <arg line="-application org.eclipse.equinox.p2.publisher.UpdateSitePublisher"/>
+                                    <arg line="-metadataRepository ${assembly.dir.url}"/>
+                                    <arg line="-artifactRepository ${assembly.dir.url}"/>
+                                    <arg line="-source ${assembly.dir}"/>
                                 </java>
-                                <zip destfile="${output.zip}" update="true" includes="artifacts.xml content.xml" basedir="${assembly.dir}" />
+                                <zip destfile="${output.zip}" update="true" includes="artifacts.xml content.xml" basedir="${assembly.dir}"/>
                             </tasks>
                         </configuration>
                         <goals>
@@ -156,8 +153,8 @@
             </plugin>
         </plugins>
     </build>
+
     <dependencies>
-           
         <!-- 
          |
          | Plug-ins
@@ -168,145 +165,145 @@
             <artifactId>org.apache.geronimo.j2ee.v11.jaxbmodel</artifactId>
             <version>${version}</version>
         </dependency>
-         
+
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.jee.v21.jaxbmodel</artifactId>
             <version>${version}</version>
         </dependency>
-           
+
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.jaxbmodel.common</artifactId>
             <version>${version}</version>
         </dependency>
-           
+
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.runtime.common</artifactId>
             <version>${version}</version>
         </dependency>
-           
+
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.runtime.v11</artifactId>
             <version>${version}</version>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.runtime.v20</artifactId>
             <version>${version}</version>
         </dependency>
-           
+
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.runtime.v21</artifactId>
             <version>${version}</version>
         </dependency>
-           
+
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.runtime.v22</artifactId>
             <version>${version}</version>
         </dependency>
 
-       <dependency>
+        <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.runtime.v30</artifactId>
             <version>${version}</version>
         </dependency>
-           
+
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.st.core</artifactId>
             <version>${version}</version>
         </dependency>
-           
+
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.st.ui</artifactId>
             <version>${version}</version>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.st.schemas</artifactId>
             <version>${version}</version>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.st.v11.schemas</artifactId>
             <version>${version}</version>
         </dependency>
-           
+
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.st.v11.core</artifactId>
             <version>${version}</version>
         </dependency>
-           
+
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.st.v11.ui</artifactId>
             <version>${version}</version>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.st.v20.core</artifactId>
             <version>${version}</version>
         </dependency>
-           
+
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.st.v20.ui</artifactId>
             <version>${version}</version>
         </dependency>
-           
+
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.st.v21.core</artifactId>
             <version>${version}</version>
         </dependency>
-           
+
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.st.v21.ui</artifactId>
             <version>${version}</version>
         </dependency>
-           
+
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.st.v22.core</artifactId>
             <version>${version}</version>
         </dependency>
-           
+
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.st.v22.ui</artifactId>
             <version>${version}</version>
         </dependency>
 
-       <dependency>
+        <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.st.v30.core</artifactId>
             <version>${version}</version>
         </dependency>
-           
+
         <dependency>
-             <groupId>org.apache.geronimo.devtools</groupId>
-             <artifactId>org.apache.geronimo.st.v30.jaxbmodel</artifactId>
-             <version>${version}</version>
-         </dependency>
+            <groupId>org.apache.geronimo.devtools</groupId>
+            <artifactId>org.apache.geronimo.st.v30.jaxbmodel</artifactId>
+            <version>${version}</version>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.devtools</groupId>
             <artifactId>org.apache.geronimo.st.v30.ui</artifactId>
             <version>${version}</version>
         </dependency>
-           
+
         <!-- 
          |
          | Features
@@ -323,6 +320,5 @@
             <artifactId>org.apache.geronimo.v30.feature</artifactId>
             <version>${version}</version>
         </dependency>
-           
     </dependencies>
 </project>

Modified: geronimo/devtools/eclipse-plugin/branches/3.0/features/org.apache.geronimo.v30.feature/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0/features/org.apache.geronimo.v30.feature/NOTICE.txt?rev=1486260&r1=1486259&r2=1486260&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0/features/org.apache.geronimo.v30.feature/NOTICE.txt (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0/features/org.apache.geronimo.v30.feature/NOTICE.txt Sat May 25 00:27:05 2013
@@ -1,5 +1,5 @@
 Apache Geronimo 
-Copyright 2003-2011 The Apache Software Foundation
+Copyright 2003-2013 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).

Modified: geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/META-INF/MANIFEST.MF?rev=1486260&r1=1486259&r2=1486260&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/META-INF/MANIFEST.MF Sat May 25 00:27:05 2013
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Geronimo V11 JAXB Models
 Bundle-SymbolicName: org.apache.geronimo.j2ee.v11.jaxbmodel;singleton:=true
-Bundle-Version: 3.0.0
+Bundle-Version: 3.0.1
 Bundle-ClassPath: .
 Bundle-Vendor: Apache Software Foundation
 Require-Bundle: 

Modified: geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.jaxbmodel.common/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.jaxbmodel.common/META-INF/MANIFEST.MF?rev=1486260&r1=1486259&r2=1486260&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.jaxbmodel.common/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.jaxbmodel.common/META-INF/MANIFEST.MF Sat May 25 00:27:05 2013
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Common operation for Geronimo JAXB model
 Bundle-SymbolicName: org.apache.geronimo.jaxbmodel.common;singleton:=true
-Bundle-Version: 3.0.0
+Bundle-Version: 3.0.1
 Bundle-Activator: org.apache.geronimo.jaxbmodel.common.Activator
 Require-Bundle: org.apache.geronimo.runtime.common,
  org.eclipse.core.runtime,

Modified: geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.jee.v21.jaxbmodel/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.jee.v21.jaxbmodel/META-INF/MANIFEST.MF?rev=1486260&r1=1486259&r2=1486260&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.jee.v21.jaxbmodel/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.jee.v21.jaxbmodel/META-INF/MANIFEST.MF Sat May 25 00:27:05 2013
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Geronimo V21 JAXB Models
 Bundle-SymbolicName: org.apache.geronimo.jee.v21.jaxbmodel;singleton:=true
-Bundle-Version: 3.0.0
+Bundle-Version: 3.0.1
 Bundle-ClassPath: .
 Bundle-Vendor: Apache Software Foundation
 Require-Bundle: org.apache.geronimo.runtime.common,

Modified: geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.jee.v22.jaxbmodel/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.jee.v22.jaxbmodel/META-INF/MANIFEST.MF?rev=1486260&r1=1486259&r2=1486260&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.jee.v22.jaxbmodel/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.jee.v22.jaxbmodel/META-INF/MANIFEST.MF Sat May 25 00:27:05 2013
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Geronimo V22JAXB Models
 Bundle-SymbolicName: org.apache.geronimo.jee.v22.jaxbmodel;singleton:=true
-Bundle-Version: 3.0.0
+Bundle-Version: 3.0.1
 Bundle-ClassPath: .
 Bundle-Vendor: Apache Software Foundation
 Require-Bundle: org.apache.geronimo.runtime.common,

Modified: geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF?rev=1486260&r1=1486259&r2=1486260&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF Sat May 25 00:27:05 2013
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Geronimo Common Runtime Plug-in
 Bundle-SymbolicName: org.apache.geronimo.runtime.common;singleton:=true
-Bundle-Version: 3.0.0
+Bundle-Version: 3.0.1
 Bundle-Activator: org.apache.geronimo.runtime.common.log.Logger
 Require-Bundle: 
  org.eclipse.core.runtime
@@ -78,3 +78,4 @@ Export-Package: 
  org.apache.geronimo.specs.activation
 Bundle-Vendor: Apache Software Foundation
 Import-Package: javax.xml.namespace
+Bundle-ActivationPolicy: lazy

Modified: geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v11/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v11/LICENSE.txt?rev=1486260&r1=1486259&r2=1486260&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v11/LICENSE.txt (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v11/LICENSE.txt Sat May 25 00:27:05 2013
@@ -244,7 +244,7 @@ For org.apache.geronimo.runtime.* jar:
 
 =========================================================================
 ==  SLF4J License                                                      ==
-==  slffj-api slf4j-simple                                             ==
+==  slf4j-api slf4j-simple                                             ==
 =========================================================================
 
 Copyright (c) 2004-2011 QOS.ch 

Modified: geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v11/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v11/META-INF/MANIFEST.MF?rev=1486260&r1=1486259&r2=1486260&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v11/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v11/META-INF/MANIFEST.MF Sat May 25 00:27:05 2013
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Geronimo V11 Runtime Plug-in
 Bundle-SymbolicName: org.apache.geronimo.runtime.v11;singleton:=true
-Bundle-Version: 3.0.0
+Bundle-Version: 3.0.1
 Require-Bundle: org.apache.geronimo.runtime.common;visibility:=reexport
 Bundle-ClassPath: lib/openejb-builder-2.1.1.jar,
  lib/geronimo-web-builder-1.1.1.jar,

Modified: geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v11/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v11/NOTICE.txt?rev=1486260&r1=1486259&r2=1486260&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v11/NOTICE.txt (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v11/NOTICE.txt Sat May 25 00:27:05 2013
@@ -21,7 +21,7 @@ package) which was developed by the Boun
 
      Copyright (c) 2000-2005 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
 
-For slffj-api jar in org.apache.geronimo.runtime.* and 
+For slf4j-api jar in org.apache.geronimo.runtime.* and 
 slf4j-simple jar in org.apache.geronimo.runtime.*
 
 =========================================================================

Modified: geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v20/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v20/LICENSE.txt?rev=1486260&r1=1486259&r2=1486260&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v20/LICENSE.txt (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v20/LICENSE.txt Sat May 25 00:27:05 2013
@@ -244,7 +244,7 @@ For org.apache.geronimo.runtime.* jar:
 
 =========================================================================
 ==  SLF4J License                                                      ==
-==  slffj-api slf4j-simple                                             ==
+==  slf4j-api slf4j-simple                                             ==
 =========================================================================
 
 Copyright (c) 2004-2011 QOS.ch 

Modified: geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v20/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v20/META-INF/MANIFEST.MF?rev=1486260&r1=1486259&r2=1486260&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v20/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v20/META-INF/MANIFEST.MF Sat May 25 00:27:05 2013
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Geronimo V20 Runtime Plug-in
 Bundle-SymbolicName: org.apache.geronimo.runtime.v20;singleton:=true
-Bundle-Version: 3.0.0
+Bundle-Version: 3.0.1
 Require-Bundle: org.apache.geronimo.runtime.common;visibility:=reexport
 Bundle-ClassPath: lib/geronimo-common-2.0.2.jar,
  lib/geronimo-deploy-jsr88-2.0.2.jar,

Modified: geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v20/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v20/NOTICE.txt?rev=1486260&r1=1486259&r2=1486260&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v20/NOTICE.txt (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v20/NOTICE.txt Sat May 25 00:27:05 2013
@@ -21,7 +21,7 @@ package) which was developed by the Boun
 
      Copyright (c) 2000-2005 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
 
-For slffj-api jar in org.apache.geronimo.runtime.* and 
+For slf4j-api jar in org.apache.geronimo.runtime.* and 
 slf4j-simple jar in org.apache.geronimo.runtime.*
 
 =========================================================================

Modified: geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v21/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v21/LICENSE.txt?rev=1486260&r1=1486259&r2=1486260&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v21/LICENSE.txt (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v21/LICENSE.txt Sat May 25 00:27:05 2013
@@ -482,7 +482,7 @@ For org.apache.geronimo.runtime.* jar:
 
 =========================================================================
 ==  SLF4J License                                                      ==
-==  slffj-api slf4j-simple                                             ==
+==  slf4j-api slf4j-simple                                             ==
 =========================================================================
 
 Copyright (c) 2004-2011 QOS.ch 

Modified: geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF?rev=1486260&r1=1486259&r2=1486260&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF Sat May 25 00:27:05 2013
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Geronimo V21 Runtime Plug-in
 Bundle-SymbolicName: org.apache.geronimo.runtime.v21;singleton:=true
-Bundle-Version: 3.0.0
+Bundle-Version: 3.0.1
 Require-Bundle: org.apache.geronimo.runtime.common;visibility:=reexport
 Bundle-ClassPath: lib/geronimo-common-2.1.7.jar,
  lib/geronimo-deploy-jsr88-2.1.7.jar,

Modified: geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v21/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v21/NOTICE.txt?rev=1486260&r1=1486259&r2=1486260&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v21/NOTICE.txt (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v21/NOTICE.txt Sat May 25 00:27:05 2013
@@ -34,7 +34,7 @@ The source code for the Plexus project c
 
 http://plexus.codehaus.org/source-repository.html
 
-For slffj-api jar in org.apache.geronimo.runtime.* and 
+For slf4j-api jar in org.apache.geronimo.runtime.* and 
 slf4j-simple jar in org.apache.geronimo.runtime.*
 
 =========================================================================

Modified: geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v22/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v22/LICENSE.txt?rev=1486260&r1=1486259&r2=1486260&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v22/LICENSE.txt (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v22/LICENSE.txt Sat May 25 00:27:05 2013
@@ -482,7 +482,7 @@ For org.apache.geronimo.runtime.* jar:
 
 =========================================================================
 ==  SLF4J License                                                      ==
-==  slffj-api slf4j-simple                                             ==
+==  slf4j-api slf4j-simple                                             ==
 =========================================================================
 
 Copyright (c) 2004-2011 QOS.ch 

Modified: geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v22/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v22/META-INF/MANIFEST.MF?rev=1486260&r1=1486259&r2=1486260&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v22/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v22/META-INF/MANIFEST.MF Sat May 25 00:27:05 2013
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Geronimo V22 Runtime Plug-in
 Bundle-SymbolicName: org.apache.geronimo.runtime.v22;singleton:=true
-Bundle-Version: 3.0.0
+Bundle-Version: 3.0.1
 Require-Bundle: org.apache.geronimo.runtime.common;visibility:=reexport
 Bundle-ClassPath: lib/geronimo-common-2.2.1.jar,
  lib/geronimo-deploy-jsr88-2.2.1.jar,

Modified: geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v22/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v22/NOTICE.txt?rev=1486260&r1=1486259&r2=1486260&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v22/NOTICE.txt (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v22/NOTICE.txt Sat May 25 00:27:05 2013
@@ -34,7 +34,7 @@ The source code for the Plexus project c
 
 http://plexus.codehaus.org/source-repository.html
 
-For slffj-api jar in org.apache.geronimo.runtime.* and 
+For slf4j-api jar in org.apache.geronimo.runtime.* and 
 slf4j-simple jar in org.apache.geronimo.runtime.*
 
 =========================================================================

Modified: geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v30/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v30/LICENSE.txt?rev=1486260&r1=1486259&r2=1486260&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v30/LICENSE.txt (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v30/LICENSE.txt Sat May 25 00:27:05 2013
@@ -482,7 +482,7 @@ For org.apache.geronimo.runtime.* jar:
 
 =========================================================================
 ==  SLF4J License                                                      ==
-==  slffj-api slf4j-simple                                             ==
+==  slf4j-api slf4j-simple                                             ==
 =========================================================================
 
 Copyright (c) 2004-2011 QOS.ch 

Modified: geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v30/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v30/META-INF/MANIFEST.MF?rev=1486260&r1=1486259&r2=1486260&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v30/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v30/META-INF/MANIFEST.MF Sat May 25 00:27:05 2013
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Geronimo V30 Runtime Plug-in
 Bundle-SymbolicName: org.apache.geronimo.runtime.v30;singleton:=true
-Bundle-Version: 3.0.0
+Bundle-Version: 3.0.1
 Require-Bundle: 
  org.eclipse.osgi,
  org.apache.geronimo.runtime.common;visibility:=reexport

Modified: geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v30/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v30/NOTICE.txt?rev=1486260&r1=1486259&r2=1486260&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v30/NOTICE.txt (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.runtime.v30/NOTICE.txt Sat May 25 00:27:05 2013
@@ -35,7 +35,7 @@ The source code for the Plexus project c
 http://plexus.codehaus.org/source-repository.html
 
 
-For slffj-api jar in org.apache.geronimo.runtime.* and 
+For slf4j-api jar in org.apache.geronimo.runtime.* and 
 slf4j-simple jar in org.apache.geronimo.runtime.*
 
 =========================================================================

Modified: geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.core/META-INF/MANIFEST.MF?rev=1486260&r1=1486259&r2=1486260&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.core/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.core/META-INF/MANIFEST.MF Sat May 25 00:27:05 2013
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Geronimo Server Tools Core Plug-in
 Bundle-SymbolicName: org.apache.geronimo.st.core;singleton:=true
-Bundle-Version: 3.0.0   
+Bundle-Version: 3.0.1   
 Bundle-Activator: org.apache.geronimo.st.core.Activator
 Bundle-Vendor: Apache Software Foundation
 Bundle-Localization: plugin

Modified: geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.schemas/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.schemas/META-INF/MANIFEST.MF?rev=1486260&r1=1486259&r2=1486260&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.schemas/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.schemas/META-INF/MANIFEST.MF Sat May 25 00:27:05 2013
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Geronimo Schema Catalog Plug-in
 Bundle-SymbolicName: org.apache.geronimo.st.schemas;singleton:=true
-Bundle-Version: 3.0.0
+Bundle-Version: 3.0.1
 Require-Bundle: org.eclipse.wst.xml.core
 Bundle-Vendor: Apache Software Foundation
 Bundle-ActivationPolicy: lazy

Modified: geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.ui/META-INF/MANIFEST.MF?rev=1486260&r1=1486259&r2=1486260&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.ui/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.ui/META-INF/MANIFEST.MF Sat May 25 00:27:05 2013
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.apache.geronimo.st.ui;singleton:=true
-Bundle-Version: 3.0.0
+Bundle-Version: 3.0.1
 Bundle-Activator: org.apache.geronimo.st.ui.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.apache.geronimo.runtime.common,
  org.apache.geronimo.st.core;visibility:=reexport,
- org.apache.geronimo.jaxbmodel.common;bundle-version="3.0.0",
+ org.apache.geronimo.jaxbmodel.common;bundle-version="3.0.1",
  org.eclipse.core.runtime,
  org.eclipse.wst.server.core,
  org.eclipse.ui.forms,

Modified: geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v11.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v11.core/META-INF/MANIFEST.MF?rev=1486260&r1=1486259&r2=1486260&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v11.core/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v11.core/META-INF/MANIFEST.MF Sat May 25 00:27:05 2013
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Geronimo v11 Server Tools Core Plug-in
 Bundle-SymbolicName: org.apache.geronimo.st.v11.core;singleton:=true
-Bundle-Version: 3.0.0   
+Bundle-Version: 3.0.1   
 Bundle-Activator: org.apache.geronimo.st.v11.core.Activator
 Bundle-Vendor: Apache.org
 Bundle-Localization: plugin

Modified: geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v11.schemas/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v11.schemas/META-INF/MANIFEST.MF?rev=1486260&r1=1486259&r2=1486260&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v11.schemas/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v11.schemas/META-INF/MANIFEST.MF Sat May 25 00:27:05 2013
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Geronimo Schema Catalog Plug-in
 Bundle-SymbolicName: org.apache.geronimo.st.v11.schemas;singleton:=true
-Bundle-Version: 3.0.0
+Bundle-Version: 3.0.1
 Require-Bundle: org.eclipse.wst.xml.core
 Bundle-Vendor: Apache Software Foundation
 Bundle-ActivationPolicy: lazy

Modified: geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v11.ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v11.ui/META-INF/MANIFEST.MF?rev=1486260&r1=1486259&r2=1486260&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v11.ui/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v11.ui/META-INF/MANIFEST.MF Sat May 25 00:27:05 2013
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Geronimo Server Tools V11 UI Plug-in
 Bundle-SymbolicName: org.apache.geronimo.st.v11.ui;singleton:=true
-Bundle-Version: 3.0.0
+Bundle-Version: 3.0.1
 Bundle-Activator: org.apache.geronimo.st.v11.ui.Activator
 Bundle-Vendor: Apache.org
 Bundle-Localization: plugin

Modified: geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v20.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v20.core/META-INF/MANIFEST.MF?rev=1486260&r1=1486259&r2=1486260&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v20.core/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v20.core/META-INF/MANIFEST.MF Sat May 25 00:27:05 2013
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.apache.geronimo.st.v20.core;singleton:=true
-Bundle-Version: 3.0.0
+Bundle-Version: 3.0.1
 Bundle-Activator: org.apache.geronimo.st.v21.core.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

Modified: geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v20.ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v20.ui/META-INF/MANIFEST.MF?rev=1486260&r1=1486259&r2=1486260&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v20.ui/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v20.ui/META-INF/MANIFEST.MF Sat May 25 00:27:05 2013
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Geronimo Server Tools V20 UI Plug-in
 Bundle-SymbolicName: org.apache.geronimo.st.v20.ui;singleton:=true
-Bundle-Version: 3.0.0
+Bundle-Version: 3.0.1
 Require-Bundle: org.apache.geronimo.runtime.common,
  org.apache.geronimo.st.v20.core,
  org.apache.geronimo.st.ui,

Modified: geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v21.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v21.core/META-INF/MANIFEST.MF?rev=1486260&r1=1486259&r2=1486260&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v21.core/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v21.core/META-INF/MANIFEST.MF Sat May 25 00:27:05 2013
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.apache.geronimo.st.v21.core;singleton:=true
-Bundle-Version: 3.0.0
+Bundle-Version: 3.0.1
 Bundle-Activator: org.apache.geronimo.st.v21.core.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

Modified: geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v21.ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v21.ui/META-INF/MANIFEST.MF?rev=1486260&r1=1486259&r2=1486260&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v21.ui/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v21.ui/META-INF/MANIFEST.MF Sat May 25 00:27:05 2013
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Geronimo Server Tools V21 UI Plug-in
 Bundle-SymbolicName: org.apache.geronimo.st.v21.ui;singleton:=true
-Bundle-Version: 3.0.0
+Bundle-Version: 3.0.1
 Bundle-Activator: org.apache.geronimo.st.v21.ui.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.apache.geronimo.runtime.common,

Modified: geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v22.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v22.core/META-INF/MANIFEST.MF?rev=1486260&r1=1486259&r2=1486260&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v22.core/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v22.core/META-INF/MANIFEST.MF Sat May 25 00:27:05 2013
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.apache.geronimo.st.v22.core;singleton:=true
-Bundle-Version: 3.0.0
+Bundle-Version: 3.0.1
 Bundle-Activator: org.apache.geronimo.st.v22.core.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

Modified: geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v22.ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v22.ui/META-INF/MANIFEST.MF?rev=1486260&r1=1486259&r2=1486260&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v22.ui/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v22.ui/META-INF/MANIFEST.MF Sat May 25 00:27:05 2013
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Geronimo Server Tools V22 UI Plug-in
 Bundle-SymbolicName: org.apache.geronimo.st.v22.ui;singleton:=true
-Bundle-Version: 3.0.0
+Bundle-Version: 3.0.1
 Require-Bundle: org.apache.geronimo.runtime.common,
  org.apache.geronimo.st.ui,
  org.apache.geronimo.st.v21.ui, 

Modified: geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.core/META-INF/MANIFEST.MF?rev=1486260&r1=1486259&r2=1486260&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.core/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.core/META-INF/MANIFEST.MF Sat May 25 00:27:05 2013
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.apache.geronimo.st.v30.core;singleton:=true
-Bundle-Version: 3.0.0
+Bundle-Version: 3.0.1
 Bundle-Activator: org.apache.geronimo.st.v30.core.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -19,6 +19,7 @@ Require-Bundle: 
  org.eclipse.debug.core,
  org.eclipse.emf.ecore,
  org.eclipse.jdt.core,
+ org.eclipse.jdt.debug,
  org.eclipse.jdt.launching,
  org.eclipse.jem.util,
  org.eclipse.jst.common.frameworks,

Modified: geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.core/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.core/NOTICE.txt?rev=1486260&r1=1486259&r2=1486260&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.core/NOTICE.txt (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.core/NOTICE.txt Sat May 25 00:27:05 2013
@@ -1,5 +1,5 @@
 Apache Geronimo 
-Copyright 2003-2011 The Apache Software Foundation
+Copyright 2003-2013 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).

Modified: geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/Activator.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/Activator.java?rev=1486260&r1=1486259&r2=1486260&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/Activator.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/Activator.java Sat May 25 00:27:05 2013
@@ -110,7 +110,10 @@ public class Activator extends Plugin {
             }
 
             public void serverChanged(IServer server) {
-
+                GeronimoServerBehaviourDelegate delegate = getGeronimoServerBehaviourDelegate(server);
+                if (delegate != null) {
+                    delegate.resetKernelConnection();
+                }
             }
 
             public void serverRemoved(IServer server) {

Modified: geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/DeploymentUtils.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/DeploymentUtils.java?rev=1486260&r1=1486259&r2=1486260&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/DeploymentUtils.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/DeploymentUtils.java Sat May 25 00:27:05 2013
@@ -17,7 +17,10 @@
 package org.apache.geronimo.st.v30.core;
 
 import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -33,6 +36,7 @@ import org.apache.geronimo.st.v30.core.i
 import org.apache.geronimo.st.v30.core.osgi.AriesHelper;
 import org.apache.geronimo.st.v30.core.osgi.OsgiConstants;
 import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IStatus;
@@ -133,13 +137,18 @@ public class DeploymentUtils {
             //file = generateRunFromWorkspaceConfig(getModule());
             throw new CoreException(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Run from workspace is unsupported."));
         } else {
-            IPath outputDir = DeploymentUtils.STATE_LOC.append("server_" + server.getId());
-            outputDir.toFile().mkdirs();
+            IPath outputDir = getServerDirectory(server);
             file = DeploymentUtils.createJarFile(module, outputDir);
         }
         return file;
     }
     
+    public static IPath getServerDirectory(IServer server) {
+        IPath outputDir = DeploymentUtils.STATE_LOC.append("server_" + server.getId());
+        outputDir.toFile().mkdirs();
+        return outputDir;
+    }
+    
     public static int getModuleState(IServer server, IModule module) {
         return server.getModuleState(new IModule[] {module});
     }
@@ -330,17 +339,15 @@ public class DeploymentUtils {
         return null;
     }
     
-    public static List<IModuleResourceDelta> getAffectedFiles(IModuleResourceDelta delta, List<String> includes, List<String> excludes) {
-        Trace.tracePoint("Entry", Activator.traceCore, "DeploymentUtils.getAffectedFiles", delta, includes, excludes);
-
+    public static boolean isMatchingDelta(IModuleResourceDelta delta, List<String> includes, List<String> excludes) {
+        Trace.tracePoint("Entry", Activator.traceCore, "DeploymentUtils.isMatchingDelta", delta, includes, excludes);
+        
         if (delta == null) {
-            Trace.tracePoint("Exit ", Activator.traceCore, "DeploymentUtils.getAffectedFiles", (Object) null);
-            return null;
-        }
-
+            Trace.tracePoint("Exit ", Activator.traceCore, "DeploymentUtils.isMatchingDelta", delta, false);
+            return false;
+        } 
+        
         IModuleResource resource = delta.getModuleResource();
-        List<IModuleResourceDelta> fileList = new ArrayList<IModuleResourceDelta>();
-
         if (resource instanceof IModuleFile) {
             IModuleFile moduleFile = (IModuleFile) resource;
             String name = moduleFile.getName();
@@ -349,30 +356,29 @@ public class DeploymentUtils {
                 name = relativePath.toOSString() + File.separator + moduleFile.getName();
             }
             if (hasMatch(name, excludes)) {
-                Trace.tracePoint("Exit ", Activator.traceCore, "DeploymentUtils.getAffectedFiles", "Excluded", name);
-                return null;
+                Trace.tracePoint("Exit ", Activator.traceCore, "DeploymentUtils.isMatchingDelta", "Excluded", name);
+                return false;
             }
             if (hasMatch(name, includes)) {
-                fileList.add(delta);
+                // we have a match - keep checking
             } else {
-                Trace.tracePoint("Exit ", Activator.traceCore, "DeploymentUtils.getAffectedFiles", "Not included", name);
-                return null;
+                Trace.tracePoint("Exit ", Activator.traceCore, "DeploymentUtils.isMatchingDelta", "Not included", name);
+                return false;
             }
         } else if (resource instanceof IModuleFolder) {
             IModuleResourceDelta[] deltaArray = delta.getAffectedChildren();
             for (IModuleResourceDelta childDelta : deltaArray) {
-                List<IModuleResourceDelta> deltaChildren = getAffectedFiles(childDelta, includes, excludes);
-                if (deltaChildren != null) {
-                    fileList.addAll(deltaChildren);
+                if (isMatchingDelta(childDelta, includes, excludes)) {
+                    // we have a match - keep checking
                 } else {
-                    Trace.tracePoint("Exit ", Activator.traceCore, "DeploymentUtils.getAffectedFiles", (Object) null);
-                    return null;
+                    Trace.tracePoint("Exit ", Activator.traceCore, "DeploymentUtils.isMatchingDelta", delta, false);
+                    return false;
                 }
             }
         }
 
-        Trace.tracePoint("Exit ", Activator.traceCore, "DeploymentUtils.getAffectedFiles", fileList);
-        return fileList;
+        Trace.tracePoint("Exit ", Activator.traceCore, "DeploymentUtils.isMatchingDelta", delta, true);
+        return true;
     }
     
     private static boolean hasMatch(String name, List<String> patterns) {
@@ -384,6 +390,93 @@ public class DeploymentUtils {
         return false;
     }     
     
+    public static void publishDelta(IModuleResourceDelta delta, IPath publishPath, List<IStatus> statusList) {
+        IModuleResource resource = delta.getModuleResource();
+        int kind = delta.getKind();
+
+        if (resource instanceof IModuleFile) {
+            // it's a file        
+            IPath filePath = publishPath.append(resource.getModuleRelativePath()).append(resource.getName());
+            File file = filePath.toFile();
+            if (kind == IModuleResourceDelta.REMOVED) {
+                if (file.exists() && !file.delete()) {
+                    statusList.add(new Status(IStatus.ERROR, Activator.PLUGIN_ID, 0, "Unable to delete file: " + file.getAbsolutePath(), null));
+                }
+            } else {
+                File parentFile = file.getParentFile();
+                if (parentFile != null && !parentFile.exists()) {
+                    if (!parentFile.mkdirs()) {
+                        statusList.add(new Status(IStatus.ERROR, Activator.PLUGIN_ID, 0, "Unable to create parent directory: " + parentFile.getAbsolutePath(), null));
+                        return;
+                    }
+                }
+                
+                IModuleFile moduleFile = (IModuleFile) resource;
+                try {
+                    copyFile(moduleFile, file);
+                } catch (CoreException e) {
+                    statusList.add(e.getStatus());
+                } catch (IOException e) {
+                    statusList.add(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Error copying file " + file.getAbsolutePath(), e));
+                }
+            }
+        } else if (resource instanceof IModuleFolder) {
+            // it's directory
+            if (kind == IModuleResourceDelta.ADDED) {
+                IPath filePath = publishPath.append(resource.getModuleRelativePath()).append(resource.getName());
+                File file = filePath.toFile();
+                if (!file.exists() && !file.mkdirs()) {
+                    statusList.add(new Status(IStatus.ERROR, Activator.PLUGIN_ID, 0, "Unable to create directory: " + file.getAbsolutePath(), null));
+                    return;
+                }
+            }
+
+            IModuleResourceDelta[] childDeltas = delta.getAffectedChildren();
+            if (childDeltas != null) {
+                for (IModuleResourceDelta childDelta : childDeltas) {
+                    publishDelta(childDelta, publishPath, statusList);
+                }
+            }
+
+            if (kind == IModuleResourceDelta.REMOVED) {
+                IPath filePath = publishPath.append(resource.getModuleRelativePath()).append(resource.getName());
+                File file = filePath.toFile();
+                if (file.exists() && !file.delete()) {
+                    statusList.add(new Status(IStatus.ERROR, Activator.PLUGIN_ID, 0, "Unable to delete directory: " + file.getAbsolutePath(), null));
+                }
+            }
+        }
+    }
+    
+    private static void copyFile(IModuleFile moduleFile, File target) throws CoreException, IOException {
+        byte[] buffer = new byte[10 * 1024];
+        int bytesRead;    
+        InputStream in = null;
+        FileOutputStream out = null;
+        try {
+            IFile srcIFile = (IFile) moduleFile.getAdapter(IFile.class);
+            if (srcIFile != null) {
+                in = srcIFile.getContents();
+            } else {
+                File srcFile = (File) moduleFile.getAdapter(File.class);
+                in = new FileInputStream(srcFile);
+            }
+        
+            out = new FileOutputStream(target);
+            
+            while ((bytesRead = in.read(buffer)) > 0) {
+                out.write(buffer, 0, bytesRead);
+            }
+        } finally {
+            if (in != null) {
+                try { in.close(); } catch (IOException ignore) {}
+            }
+            if (out != null) {
+                try { out.close(); } catch (IOException ignore) {}
+            }
+        }
+    }
+    
     public static boolean isInstalledModule(IServer server, String configId) {
         Trace.tracePoint("Entry", Activator.traceCore, "DeploymentUtils.isInstalledModule", server, configId);
         boolean isInstalled = false;
@@ -480,6 +573,29 @@ public class DeploymentUtils {
         return true;
     }
     
+    
+    /**
+     * Returns true only if the delta contains at least one CHANGED class resource. 
+     */
+    public static boolean containsChangedClassResources(IModuleResourceDelta[] deltaArray) {
+        for (IModuleResourceDelta delta : deltaArray) {
+            int kind = delta.getKind();                    
+            IModuleResource resource = delta.getModuleResource();
+            if (resource instanceof IModuleFile) {
+                String name = resource.getName();
+                if (name.endsWith(".class") && kind == IModuleResourceDelta.CHANGED) {
+                    return true;
+                }
+            } else if (resource instanceof IModuleFolder) {
+                IModuleResourceDelta[] childDeltaArray = delta.getAffectedChildren();
+                if (containsChangedClassResources(childDeltaArray)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
     public static File createChangeSetFile(IModuleResource[] resources) {
         Trace.tracePoint("Entry", Activator.traceCore, "DeploymentUtils.createChangeSetFile", resources);
         

Modified: geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoLaunchConfigurationDelegate.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoLaunchConfigurationDelegate.java?rev=1486260&r1=1486259&r2=1486260&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoLaunchConfigurationDelegate.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/3.0/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/GeronimoLaunchConfigurationDelegate.java Sat May 25 00:27:05 2013
@@ -17,13 +17,16 @@
 package org.apache.geronimo.st.v30.core;
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
 import org.apache.geronimo.st.v30.core.internal.Messages;
 import org.apache.geronimo.st.v30.core.internal.Trace;
+import org.apache.geronimo.st.v30.core.util.ConfigSubstitutionsHelper;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
@@ -137,15 +140,36 @@ public class GeronimoLaunchConfiguration
     private String[] updateJVMArguments(String[] jvmArguments, GeronimoServerBehaviourDelegate server) {
         boolean managedApplicationStart = server.getServerDelegate().isManageApplicationStart();        
         Trace.trace(Trace.INFO, "GeronimoLaunchConfigurationDelegate: manageApplicationStart:=" + managedApplicationStart, Activator.traceCore);
+        
+        List<String> params = new ArrayList<String>(6);
+        
+        GeronimoServerDelegate serverDelegate = server.getServerDelegate();
+
+        params.add("-Dorg.apache.geronimo.config.substitution.prefix=gep.");
+        params.add("-Dgep." + ConfigSubstitutionsHelper.PORT_OFFSET + "=" + serverDelegate.getPortOffset());
+        params.add("-Dgep." + ConfigSubstitutionsHelper.HTTP_PORT + "=" + serverDelegate.getHTTPPort());
+        params.add("-Dgep." + ConfigSubstitutionsHelper.NAMING_PORT + "=" + serverDelegate.getRMINamingPort());
+        
+        Set<String> deletedConfigs = server.getDeletedConfigIds();
+        if (!deletedConfigs.isEmpty()) {
+            params.add(toString("-Dgeronimo.removedArtifactList=", deletedConfigs));
+        } 
+        
         if (managedApplicationStart) {
             Set<String> modifiedConfigs = server.getModifiedConfigIds();
             if (!modifiedConfigs.isEmpty()) {
-                String[] newJvmArguments = new String[jvmArguments.length + 1];
-                System.arraycopy(jvmArguments, 0, newJvmArguments, 0, jvmArguments.length);
-                newJvmArguments[jvmArguments.length] = toString("-Dgeronimo.loadOnlyConfigList=", modifiedConfigs);
-                return newJvmArguments;
+                params.add(toString("-Dgeronimo.loadOnlyConfigList=", modifiedConfigs));
             }
         }
+                
+        int size = params.size();
+        String[] newJvmArguments = new String[jvmArguments.length + size];
+        System.arraycopy(jvmArguments, 0, newJvmArguments, 0, jvmArguments.length);
+        for (int i = 0; i < size; i++) {
+            newJvmArguments[jvmArguments.length + i] = params.get(i);
+        }
+        jvmArguments = newJvmArguments;
+        
         return jvmArguments;
     }
     



Mime
View raw message