servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r664683 - in /servicemix/smx4/specs/trunk: jaxb-api-2.0/pom.xml jaxb-api-2.1/pom.xml jaxws-api-2.0/src/main/java/javax/xml/ws/spi/FactoryFinder.java jaxws-api-2.1/src/main/java/javax/xml/ws/spi/FactoryFinder.java pom.xml
Date Mon, 09 Jun 2008 11:45:15 GMT
Author: gnodet
Date: Mon Jun  9 04:45:15 2008
New Revision: 664683

URL: http://svn.apache.org/viewvc?rev=664683&view=rev
Log:
Fix compilation problem and use the JApiDiff plugin to make sure the apis signatures are the
same than the SUN's ones

Modified:
    servicemix/smx4/specs/trunk/jaxb-api-2.0/pom.xml
    servicemix/smx4/specs/trunk/jaxb-api-2.1/pom.xml
    servicemix/smx4/specs/trunk/jaxws-api-2.0/src/main/java/javax/xml/ws/spi/FactoryFinder.java
    servicemix/smx4/specs/trunk/jaxws-api-2.1/src/main/java/javax/xml/ws/spi/FactoryFinder.java
    servicemix/smx4/specs/trunk/pom.xml

Modified: servicemix/smx4/specs/trunk/jaxb-api-2.0/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/specs/trunk/jaxb-api-2.0/pom.xml?rev=664683&r1=664682&r2=664683&view=diff
==============================================================================
--- servicemix/smx4/specs/trunk/jaxb-api-2.0/pom.xml (original)
+++ servicemix/smx4/specs/trunk/jaxb-api-2.0/pom.xml Mon Jun  9 04:45:15 2008
@@ -52,11 +52,33 @@
       <version>${geronimo.activation.version}</version>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <version>2.0</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
       <plugins>
           <plugin>
+              <groupId>com.google.code.japidiff</groupId>
+              <artifactId>maven-japidiff-plugin</artifactId>
+              <version>1.0</version>
+              <executions>
+                  <execution>
+                      <goals>
+                          <goal>diff</goal>
+                      </goals>
+                  </execution>
+              </executions>
+              <configuration>
+                  <filter>javax/xml/bind.*</filter>
+                  <jar>javax.xml.bind:jaxb-api:2.0</jar>
+	          </configuration>
+          </plugin>
+          <plugin>
               <groupId>org.apache.felix</groupId>
               <artifactId>maven-bundle-plugin</artifactId>
               <executions>

Modified: servicemix/smx4/specs/trunk/jaxb-api-2.1/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/specs/trunk/jaxb-api-2.1/pom.xml?rev=664683&r1=664682&r2=664683&view=diff
==============================================================================
--- servicemix/smx4/specs/trunk/jaxb-api-2.1/pom.xml (original)
+++ servicemix/smx4/specs/trunk/jaxb-api-2.1/pom.xml Mon Jun  9 04:45:15 2008
@@ -52,11 +52,33 @@
       <version>${geronimo.activation.version}</version>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <version>2.1</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
       <plugins>
           <plugin>
+              <groupId>com.google.code.japidiff</groupId>
+              <artifactId>maven-japidiff-plugin</artifactId>
+              <version>1.0</version>
+              <executions>
+                  <execution>
+                      <goals>
+                          <goal>diff</goal>
+                      </goals>
+                  </execution>
+              </executions>
+              <configuration>
+                  <filter>javax/xml/bind.*</filter>
+                  <jar>javax.xml.bind:jaxb-api:2.1</jar>
+	          </configuration>
+          </plugin>
+          <plugin>
               <groupId>org.apache.felix</groupId>
               <artifactId>maven-bundle-plugin</artifactId>
               <executions>

Modified: servicemix/smx4/specs/trunk/jaxws-api-2.0/src/main/java/javax/xml/ws/spi/FactoryFinder.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/specs/trunk/jaxws-api-2.0/src/main/java/javax/xml/ws/spi/FactoryFinder.java?rev=664683&r1=664682&r2=664683&view=diff
==============================================================================
--- servicemix/smx4/specs/trunk/jaxws-api-2.0/src/main/java/javax/xml/ws/spi/FactoryFinder.java
(original)
+++ servicemix/smx4/specs/trunk/jaxws-api-2.0/src/main/java/javax/xml/ws/spi/FactoryFinder.java
Mon Jun  9 04:45:15 2008
@@ -171,7 +171,7 @@
                     
 			        try {
 			            // If we are deployed into an OSGi environment, leverage it
-			            Class spiClass = org.apache.servicemix.specs.locator.OsgiLocator.locate(factoryId);
+			            Class spiClass = org.apache.servicemix.specs.locator.OsgiLocator.locate(iFactoryId);
 			            if (spiClass != null) {
 			                return spiClass.newInstance();
 			            }

Modified: servicemix/smx4/specs/trunk/jaxws-api-2.1/src/main/java/javax/xml/ws/spi/FactoryFinder.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/specs/trunk/jaxws-api-2.1/src/main/java/javax/xml/ws/spi/FactoryFinder.java?rev=664683&r1=664682&r2=664683&view=diff
==============================================================================
--- servicemix/smx4/specs/trunk/jaxws-api-2.1/src/main/java/javax/xml/ws/spi/FactoryFinder.java
(original)
+++ servicemix/smx4/specs/trunk/jaxws-api-2.1/src/main/java/javax/xml/ws/spi/FactoryFinder.java
Mon Jun  9 04:45:15 2008
@@ -171,7 +171,7 @@
                     
 			        try {
 			            // If we are deployed into an OSGi environment, leverage it
-			            Class spiClass = org.apache.servicemix.specs.locator.OsgiLocator.locate(factoryId);
+			            Class spiClass = org.apache.servicemix.specs.locator.OsgiLocator.locate(iFactoryId);
 			            if (spiClass != null) {
 			                return spiClass.newInstance();
 			            }

Modified: servicemix/smx4/specs/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/specs/trunk/pom.xml?rev=664683&r1=664682&r2=664683&view=diff
==============================================================================
--- servicemix/smx4/specs/trunk/pom.xml (original)
+++ servicemix/smx4/specs/trunk/pom.xml Mon Jun  9 04:45:15 2008
@@ -113,6 +113,12 @@
           <name>Apache ServiceMix Repository</name>
           <url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url>
       </pluginRepository>
+      <!-- JApiDiff-->
+      <pluginRepository>
+          <id>japidiff</id>
+          <name>JApiDiff Repository</name>
+          <url>http://japidiff.googlecode.com/svn/m2-repo</url>
+      </pluginRepository>
   </pluginRepositories>
 
   <dependencyManagement>



Mime
View raw message