You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by mc...@apache.org on 2008/08/18 22:43:44 UTC

svn commit: r686865 - in /geronimo/devtools/eclipse-plugin/branches/2.1.2: plugins/org.apache.geronimo.jee.v21.jaxbmodel/ plugins/org.apache.geronimo.st.v20.core/ plugins/org.apache.geronimo.st.v21.core/ testsuite/plugins/org.apache.geronimo.testsuite....

Author: mcconne
Date: Mon Aug 18 13:43:43 2008
New Revision: 686865

URL: http://svn.apache.org/viewvc?rev=686865&view=rev
Log:
GERONIMODEVTOOLS-482 Ensure filtering is off when copying binary resource(s)

Modified:
    geronimo/devtools/eclipse-plugin/branches/2.1.2/plugins/org.apache.geronimo.jee.v21.jaxbmodel/.classpath
    geronimo/devtools/eclipse-plugin/branches/2.1.2/plugins/org.apache.geronimo.st.v20.core/pom.xml
    geronimo/devtools/eclipse-plugin/branches/2.1.2/plugins/org.apache.geronimo.st.v21.core/pom.xml
    geronimo/devtools/eclipse-plugin/branches/2.1.2/testsuite/plugins/org.apache.geronimo.testsuite.common/META-INF/MANIFEST.MF

Modified: geronimo/devtools/eclipse-plugin/branches/2.1.2/plugins/org.apache.geronimo.jee.v21.jaxbmodel/.classpath
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.2/plugins/org.apache.geronimo.jee.v21.jaxbmodel/.classpath?rev=686865&r1=686864&r2=686865&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.2/plugins/org.apache.geronimo.jee.v21.jaxbmodel/.classpath (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.2/plugins/org.apache.geronimo.jee.v21.jaxbmodel/.classpath Mon Aug 18 13:43:43 2008
@@ -4,5 +4,6 @@
 	<classpathentry kind="src" path="src/test/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="var" path="M2_REPO/xmlunit/xmlunit/1.1/xmlunit-1.1.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

Modified: geronimo/devtools/eclipse-plugin/branches/2.1.2/plugins/org.apache.geronimo.st.v20.core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.2/plugins/org.apache.geronimo.st.v20.core/pom.xml?rev=686865&r1=686864&r2=686865&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.2/plugins/org.apache.geronimo.st.v20.core/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.2/plugins/org.apache.geronimo.st.v20.core/pom.xml Mon Aug 18 13:43:43 2008
@@ -36,10 +36,21 @@
                     <include>plugin.properties</include>
                     <include>.options</include>
                     <include>about.ini</include>
-                    <include>G-logo-32x32.gif</include>
                     <include>about.html</include>
                 </includes>
             </resource>
+            <!--
+             |
+             | GERONIMODEVTOOLS-482: Ensure filtering is not used on a binary resource 
+             | as it may get inadvertently altered
+             |
+             -->
+            <resource>
+                <directory>.</directory>
+                <includes>
+                    <include>G-logo-32x32.gif</include>
+                </includes>
+            </resource>
             <resource>
             <!-- The Geronimo covention puts license and notice for artifacts shipped in this jar 
                  in the jar's meta-inf directory -->

Modified: geronimo/devtools/eclipse-plugin/branches/2.1.2/plugins/org.apache.geronimo.st.v21.core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.2/plugins/org.apache.geronimo.st.v21.core/pom.xml?rev=686865&r1=686864&r2=686865&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.2/plugins/org.apache.geronimo.st.v21.core/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.2/plugins/org.apache.geronimo.st.v21.core/pom.xml Mon Aug 18 13:43:43 2008
@@ -36,10 +36,21 @@
                     <include>plugin.properties</include>
                     <include>.options</include>
                     <include>about.ini</include>
-                    <include>G-logo-32x32.gif</include>
                     <include>about.html</include>
                 </includes>
             </resource>
+            <!--
+             |
+             | GERONIMODEVTOOLS-482: Ensure filtering is not used on a binary resource 
+             | as it may get inadvertently altered
+             |
+             -->
+            <resource>
+                <directory>.</directory>
+                <includes>
+                    <include>G-logo-32x32.gif</include>
+                </includes>
+            </resource>
             <!-- The Geronimo covention puts license and notice for artifacts shipped in this jar 
                  in the jar's meta-inf directory -->
             <resource>

Modified: geronimo/devtools/eclipse-plugin/branches/2.1.2/testsuite/plugins/org.apache.geronimo.testsuite.common/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.2/testsuite/plugins/org.apache.geronimo.testsuite.common/META-INF/MANIFEST.MF?rev=686865&r1=686864&r2=686865&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.2/testsuite/plugins/org.apache.geronimo.testsuite.common/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.2/testsuite/plugins/org.apache.geronimo.testsuite.common/META-INF/MANIFEST.MF Mon Aug 18 13:43:43 2008
@@ -4,6 +4,7 @@
 Bundle-SymbolicName: org.apache.geronimo.testsuite.common;singleton:=true
 Bundle-Version: 2.1.2
 Bundle-Vendor: Apache.org
+Bundle-Localization: plugin
 Require-Bundle: abbot.swt,
  abbot.swt.eclipse,
  org.eclipse.core.runtime,
@@ -23,8 +24,7 @@
  org.eclipse.ui.ide,
  org.eclipse.ui.views
 Bundle-ActivationPolicy: lazy
-Export-Package: com.thoughtworks.selenium,
- org.apache.geronimo.testsuite.common,
+Export-Package: org.apache.geronimo.testsuite.common,
  org.apache.geronimo.testsuite.common.selenium,
  org.apache.geronimo.testsuite.common.ui
 Import-Package: junit.framework;version="3.8.2"