You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2008/03/31 23:26:23 UTC

svn commit: r643156 - in /incubator/tuscany/java/sca: modules/ modules/databinding-saxon/ modules/implementation-xquery/ modules/saxon/ samples/quote-xquery/ samples/quote-xquery/src/main/resources/

Author: rfeng
Date: Mon Mar 31 14:26:10 2008
New Revision: 643156

URL: http://svn.apache.org/viewvc?rev=643156&view=rev
Log:
Clean up the saxon 9.0.0.2 dependency as they now in tuscany maven repo 

Removed:
    incubator/tuscany/java/sca/modules/databinding-saxon/build-saxon.xml
    incubator/tuscany/java/sca/modules/implementation-xquery/build-saxon.xml
    incubator/tuscany/java/sca/modules/saxon/
    incubator/tuscany/java/sca/samples/quote-xquery/build-saxon.xml
Modified:
    incubator/tuscany/java/sca/modules/databinding-saxon/pom.xml
    incubator/tuscany/java/sca/modules/implementation-xquery/pom.xml
    incubator/tuscany/java/sca/modules/pom.xml
    incubator/tuscany/java/sca/samples/quote-xquery/pom.xml
    incubator/tuscany/java/sca/samples/quote-xquery/src/main/resources/xqueryquotews.composite

Modified: incubator/tuscany/java/sca/modules/databinding-saxon/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-saxon/pom.xml?rev=643156&r1=643155&r2=643156&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-saxon/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/databinding-saxon/pom.xml Mon Mar 31 14:26:10 2008
@@ -28,13 +28,19 @@
     <artifactId>tuscany-databinding-saxon</artifactId>
     <name>Apache Tuscany SCA Data Binding for Saxon</name>
 
+    <repositories>
+        <repository>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <id>rfeng</id>
+            <name>Tuscany Maven 2.0 Repository</name>
+            <url>http://svn.apache.org/repos/asf/incubator/tuscany/maven</url>
+            <layout>default</layout>
+        </repository>
+    </repositories>
+
     <dependencies>
-            <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-saxon</artifactId>
-            <version>2.0-incubating-SNAPSHOT</version>
-        </dependency>
-        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-core-spi</artifactId>
@@ -85,44 +91,4 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.1</version>
-
-                <executions>
-                    <execution>
-                        <id>install-saxon</id>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <ant antfile="./build-saxon.xml" target="install-saxon">
-                                    <property name="localRepository" value="${settings.localRepository}" />
-                                </ant>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>clean-saxon-files</id>
-                        <phase>clean</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <ant antfile="./build-saxon.xml" target="clean-saxon-files">
-                                    <property name="localRepository" value="${settings.localRepository}" />
-                                </ant>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 </project>

Modified: incubator/tuscany/java/sca/modules/implementation-xquery/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-xquery/pom.xml?rev=643156&r1=643155&r2=643156&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-xquery/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/implementation-xquery/pom.xml Mon Mar 31 14:26:10 2008
@@ -83,44 +83,4 @@
 
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.1</version>
-
-                <executions>
-                    <execution>
-                        <id>install-saxon</id>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <ant antfile="./build-saxon.xml" target="install-saxon">
-                                    <property name="localRepository" value="${settings.localRepository}" />
-                                </ant>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>clean-saxon-files</id>
-                        <phase>clean</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <ant antfile="./build-saxon.xml" target="clean-saxon-files">
-                                    <property name="localRepository" value="${settings.localRepository}" />
-                                </ant>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 </project>

Modified: incubator/tuscany/java/sca/modules/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/pom.xml?rev=643156&r1=643155&r2=643156&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/pom.xml Mon Mar 31 14:26:10 2008
@@ -86,7 +86,6 @@
                 <module>databinding-xmlbeans</module>
                 <module>databinding-fastinfoset</module>
                 <module>databinding-xstream</module>
-                <module>saxon</module>
                 <module>data-engine-helper</module>
                 <module>domain</module>
                 <module>domain-api</module>

Modified: incubator/tuscany/java/sca/samples/quote-xquery/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/quote-xquery/pom.xml?rev=643156&r1=643155&r2=643156&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/quote-xquery/pom.xml (original)
+++ incubator/tuscany/java/sca/samples/quote-xquery/pom.xml Mon Mar 31 14:26:10 2008
@@ -107,42 +107,6 @@
         <finalName>${artifactId}</finalName>
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.1</version>
-
-                <executions>
-                    <execution>
-                        <id>install-saxon</id>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <ant antfile="./build-saxon.xml" target="install-saxon">
-                                    <property name="localRepository" value="${settings.localRepository}" />
-                                </ant>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>clean-saxon-files</id>
-                        <phase>clean</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <ant antfile="./build-saxon.xml" target="clean-saxon-files">
-                                    <property name="localRepository" value="${settings.localRepository}" />
-                                </ant>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
                 <version>1.0</version>
@@ -166,7 +130,6 @@
                 <artifactId>tuscany-sdo-plugin</artifactId>
                 <version>1.0-incubating-SNAPSHOT</version>
                 <executions>
-                    <!-- 
                     <execution>
                         <id>generate-quotejoin-sdo</id>
                         <phase>generate-sources</phase>
@@ -177,7 +140,6 @@
                             <goal>generate</goal>
                         </goals>
                     </execution>
-                    -->      
                     <execution>
                         <id>generate-quote-sdo</id>
                         <phase>generate-sources</phase>

Modified: incubator/tuscany/java/sca/samples/quote-xquery/src/main/resources/xqueryquotews.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/quote-xquery/src/main/resources/xqueryquotews.composite?rev=643156&r1=643155&r2=643156&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/quote-xquery/src/main/resources/xqueryquotews.composite (original)
+++ incubator/tuscany/java/sca/samples/quote-xquery/src/main/resources/xqueryquotews.composite Mon Mar 31 14:26:10 2008
@@ -22,10 +22,13 @@
     xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0" xmlns:xq="http://quote.xquery"
     name="xqueryquotews">
 
+<!-- 
     <dbsdo:import.sdo factory="org.example.avail.AvailFactory" />
     <dbsdo:import.sdo factory="org.example.price.PriceFactory" />
     <dbsdo:import.sdo factory="org.example.quote.QuoteFactory" />
     <dbsdo:import.sdo location="wsdl/quotejoin.wsdl" />
+     -->
+     <dbsdo:import.sdo factory="xquery.quote.QuoteFactory"/>
     
     <component name="QuoteJoinServerComponent">
         <tuscany:implementation.xquery location="META-INF/sca/quote_join.xq" />



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org