geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r492230 - in /geronimo/devtools/eclipse-plugin/branches/1.2.1: maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/ plugins/org.apache.geronimo.runtime.common/META-INF/ plugins/org.apache.geronimo....
Date Wed, 03 Jan 2007 17:36:00 GMT
Author: sppatel
Date: Wed Jan  3 09:35:59 2007
New Revision: 492230

URL: http://svn.apache.org/viewvc?view=rev&rev=492230
Log:
fix bundle versions based on failed validation

Modified:
    geronimo/devtools/eclipse-plugin/branches/1.2.1/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/BundleManifestMojo.java
    geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.st.core/META-INF/MANIFEST.MF

Modified: geronimo/devtools/eclipse-plugin/branches/1.2.1/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/BundleManifestMojo.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/1.2.1/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/BundleManifestMojo.java?view=diff&rev=492230&r1=492229&r2=492230
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/1.2.1/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/BundleManifestMojo.java
(original)
+++ geronimo/devtools/eclipse-plugin/branches/1.2.1/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/BundleManifestMojo.java
Wed Jan  3 09:35:59 2007
@@ -84,8 +84,9 @@
 	}
 	
 	private void validate(String attribute, String correctValue) throws MojoFailureException
{
-		String currentValue = attributes.getValue(attribute);
-		if(!correctValue.trim().equals(currentValue)) {
+		String currentValue = attributes.getValue(attribute).replaceAll(" ", "");
+		correctValue = attributes.getValue(attribute).replaceAll(" ", "");
+		if(!correctValue.equals(currentValue)) {
 			throw new MojoFailureException("Attribute value for " + attribute + " in bundle manifest
is incorrect. [Found: " + currentValue + "] [Expected: " + correctValue + "]");
 		}
 	}

Modified: geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF?view=diff&rev=492230&r1=492229&r2=492230
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF
(original)
+++ geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF
Wed Jan  3 09:35:59 2007
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Geronimo Common Runtime Plug-in
 Bundle-SymbolicName: org.apache.geronimo.runtime.common;singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 1.1.0
 Bundle-ClassPath: 
  lib/geronimo-j2ee-deployment_1.1_spec-1.0.jar,
  lib/commons-logging-1.0.4.jar,

Modified: geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.st.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.st.core/META-INF/MANIFEST.MF?view=diff&rev=492230&r1=492229&r2=492230
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.st.core/META-INF/MANIFEST.MF
(original)
+++ geronimo/devtools/eclipse-plugin/branches/1.2.1/plugins/org.apache.geronimo.st.core/META-INF/MANIFEST.MF
Wed Jan  3 09:35:59 2007
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Geronimo Server Tools Core Plug-in
 Bundle-SymbolicName: org.apache.geronimo.st.core;singleton:=true
-Bundle-Version: 1.0.0
+Bundle-Version: 1.1.0
 Bundle-Activator: org.apache.geronimo.st.core.Activator
 Bundle-Vendor: Apache
 Bundle-Localization: plugin



Mime
View raw message