You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2008/04/19 02:23:40 UTC
svn commit: r649731 - in /incubator/tuscany/java/sca/distribution: ./
bundle/ manifest/ src/main/assembly/ src/main/release/
src/main/release/bin/ src/main/release/src/
standalone/src/test/resources/repo/
tomcat/src/main/resources/sca-contributions/ we...
Author: lresende
Date: Fri Apr 18 17:23:34 2008
New Revision: 649731
URL: http://svn.apache.org/viewvc?rev=649731&view=rev
Log:
Merging distribution fixes from sca 1.2 release
Modified:
incubator/tuscany/java/sca/distribution/bundle/pom.xml
incubator/tuscany/java/sca/distribution/manifest/pom.xml
incubator/tuscany/java/sca/distribution/pom.xml
incubator/tuscany/java/sca/distribution/src/main/assembly/bin.xml
incubator/tuscany/java/sca/distribution/src/main/assembly/src.xml
incubator/tuscany/java/sca/distribution/src/main/release/CHANGES
incubator/tuscany/java/sca/distribution/src/main/release/README
incubator/tuscany/java/sca/distribution/src/main/release/RELEASE_NOTES
incubator/tuscany/java/sca/distribution/src/main/release/bin/INSTALL
incubator/tuscany/java/sca/distribution/src/main/release/bin/LICENSE
incubator/tuscany/java/sca/distribution/src/main/release/bin/NOTICE
incubator/tuscany/java/sca/distribution/src/main/release/src/BUILDING
incubator/tuscany/java/sca/distribution/src/main/release/src/LICENSE
incubator/tuscany/java/sca/distribution/src/main/release/src/NOTICE
incubator/tuscany/java/sca/distribution/standalone/src/test/resources/repo/tuscany.properties
incubator/tuscany/java/sca/distribution/tomcat/src/main/resources/sca-contributions/tuscany.properties
incubator/tuscany/java/sca/distribution/webapp/pom.xml
incubator/tuscany/java/sca/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/ContributionUploaderServlet.java (contents, props changed)
incubator/tuscany/java/sca/distribution/webapp/src/main/webapp/scaDomainInfo.jsp (contents, props changed)
Modified: incubator/tuscany/java/sca/distribution/bundle/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/bundle/pom.xml?rev=649731&r1=649730&r2=649731&view=diff
==============================================================================
--- incubator/tuscany/java/sca/distribution/bundle/pom.xml (original)
+++ incubator/tuscany/java/sca/distribution/bundle/pom.xml Fri Apr 18 17:23:34 2008
@@ -476,7 +476,7 @@
<dependency>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-impl</artifactId>
- <version>1.0-incubating-SNAPSHOT</version>
+ <version>1.0-incubating</version>
<exclusions>
<exclusion>
<!-- sdo 1.0 uses 3.2.0 but sca uses 3.2.1 -->
@@ -488,7 +488,7 @@
<dependency>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-tools</artifactId>
- <version>1.0-incubating-SNAPSHOT</version>
+ <version>1.0-incubating</version>
</dependency>
</dependencies>
@@ -532,6 +532,12 @@
<resource>META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory</resource>
</transformer>
<transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
+ <resource>META-INF/services/org.apache.tuscany.sca.binding.feed.AtomBindingFactory</resource>
+ </transformer>
+ <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
+ <resource>META-INF/services/org.apache.tuscany.sca.binding.feed.RSSBindingFactory</resource>
+ </transformer>
+ <transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
<resource>META-INF/services/org.apache.tuscany.sca.binding.atom.AtomBindingFactory</resource>
</transformer>
<transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
@@ -655,8 +661,8 @@
<resource>META-INF/services/org.apache.tuscany.sca.provider.PolicyProviderFactory</resource>
</transformer>
<transformer implementation="org.codehaus.mojo.shade.resource.AppendingTransformer">
- <resource>META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider</resource>
- </transformer>
+ <resource>META-INF/services/org.apache.tuscany.sca.definitions.SCADefinitionsProvider</resource>
+ </transformer>
</transformers>
</configuration>
</execution>
@@ -664,5 +670,4 @@
</plugin>
</plugins>
</build>
-
</project>
Modified: incubator/tuscany/java/sca/distribution/manifest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/manifest/pom.xml?rev=649731&r1=649730&r2=649731&view=diff
==============================================================================
--- incubator/tuscany/java/sca/distribution/manifest/pom.xml (original)
+++ incubator/tuscany/java/sca/distribution/manifest/pom.xml Fri Apr 18 17:23:34 2008
@@ -86,6 +86,121 @@
<version>${pom.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>apache-activemq</artifactId>
+ <version>4.1.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-console</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-optional</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-web</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-web-demo</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-jaas</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jsp_2.0_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>servlet-api-2.5</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>activesoap</groupId>
+ <artifactId>jaxp-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>activemq</groupId>
+ <artifactId>jmdns</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jrms</groupId>
+ <artifactId>jrms</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xstream</groupId>
+ <artifactId>xstream</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xmlpull</groupId>
+ <artifactId>xmlpull</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j-remote</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>tuscany-binding-jsonrpc</artifactId>
<version>${pom.version}</version>
@@ -439,7 +554,7 @@
<dependency>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-impl</artifactId>
- <version>1.0-incubating-SNAPSHOT</version>
+ <version>1.0-incubating</version>
<exclusions>
<exclusion>
<!-- sdo 1.0 uses 3.2.0 but sca uses 3.2.1 -->
@@ -451,9 +566,11 @@
<dependency>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-tools</artifactId>
- <version>1.0-incubating-SNAPSHOT</version>
+ <version>1.0-incubating</version>
</dependency>
</dependencies>
+
+
<build>
<resources>
Modified: incubator/tuscany/java/sca/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/pom.xml?rev=649731&r1=649730&r2=649731&view=diff
==============================================================================
--- incubator/tuscany/java/sca/distribution/pom.xml (original)
+++ incubator/tuscany/java/sca/distribution/pom.xml Fri Apr 18 17:23:34 2008
@@ -96,7 +96,7 @@
<dependency>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-impl</artifactId>
- <version>1.0-incubating-SNAPSHOT</version>
+ <version>1.0-incubating</version>
<exclusions>
<exclusion>
<!-- sdo 1.0 uses 3.2.0 but sca uses 3.2.1 -->
@@ -108,8 +108,129 @@
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
+ <exclusion>
+ <!-- exclude felix since we are using a later version -->
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.main</artifactId>
+ </exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>apache-activemq</artifactId>
+ <version>4.1.1</version>
+ <exclusions>
+ <!-- TUSCANY-2168 -->
+ <exclusion>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-console</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-optional</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-web</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-web-demo</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-jaas</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-connector_1.5_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-jacc_1.0_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jms_1.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jsp_2.0_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-management_1.0_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>servlet-api-2.5</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>backport-util-concurrent</groupId>
+ <artifactId>backport-util-concurrent</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>activesoap</groupId>
+ <artifactId>jaxp-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>activemq</groupId>
+ <artifactId>jmdns</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jrms</groupId>
+ <artifactId>jrms</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xstream</groupId>
+ <artifactId>xstream</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xmlpull</groupId>
+ <artifactId>xmlpull</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>mx4j</groupId>
+ <artifactId>mx4j-remote</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
<build>
Modified: incubator/tuscany/java/sca/distribution/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/src/main/assembly/bin.xml?rev=649731&r1=649730&r2=649731&view=diff
==============================================================================
--- incubator/tuscany/java/sca/distribution/src/main/assembly/bin.xml (original)
+++ incubator/tuscany/java/sca/distribution/src/main/assembly/bin.xml Fri Apr 18 17:23:34 2008
@@ -73,6 +73,8 @@
<exclude>*/.externalToolBuilders/**/*</exclude>
<exclude>*/work</exclude>
<exclude>*/work/**/*</exclude>
+ <exclude>**/derby.log</exclude>
+ <exclude>**/target/war/**</exclude>
<exclude>*/target/mvn-eclipse-cache.properties</exclude>
<exclude>*/target/classes</exclude>
<exclude>*/target/classes/**/*</exclude>
@@ -109,10 +111,14 @@
<exclude>domain-webapp/**/*</exclude>
<exclude>feed-aggregator-webapp/target/sample-feed-aggregator-webapp</exclude>
<exclude>feed-aggregator-webapp/target/sample-feed-aggregator-webapp/**/*</exclude>
+ <exclude>feed-aggregator-webapp/target/war</exclude>
+ <exclude>helloworld-bpel/target</exclude>
+ <exclude>helloworld-bpel/target/**/*</exclude>
<exclude>helloworld-dojo-webapp/src/main/webapp/dojo</exclude>
<exclude>helloworld-dojo-webapp/src/main/webapp/dojo/**/*</exclude>
<exclude>helloworld-dojo-webapp/target/sample-helloworld-dojo-webapp</exclude>
<exclude>helloworld-dojo-webapp/target/sample-helloworld-dojo-webapp/**/*</exclude>
+ <exclude>helloworld-dojo-webapp/target/war</exclude>
<exclude>helloworld-jms-webapp</exclude>
<exclude>helloworld-jms-webapp/**/*</exclude>
<exclude>helloworld-jms-webapp/work</exclude>
@@ -144,12 +150,12 @@
<exclude>helloworld-ws-sdo/work/**/*</exclude>
<exclude>helloworld-ws-sdo-webapp/target/sample-helloworld-ws-sdo-webapp</exclude>
<exclude>helloworld-ws-sdo-webapp/target/sample-helloworld-ws-sdo-webapp/**/*</exclude>
+ <exclude>loanapplication</exclude>
+ <exclude>loanapplication/**/*</exclude>
<exclude>osgi-supplychain/.felix</exclude>
<exclude>osgi-supplychain/.felix/**/*</exclude>
<exclude>osgi-supplychain/target/sample-osgi-supplychain</exclude>
<exclude>osgi-supplychain/target/sample-osgi-supplychain/**/*</exclude>
- <exclude>loanapplication</exclude>
- <exclude>loanapplication/**/*</exclude>
<exclude>simple-callback-ws/work</exclude>
<exclude>simple-callback-ws/work/**/*</exclude>
<exclude>spi-implementation-pojo</exclude>
@@ -177,22 +183,6 @@
<include>**/*</include>
</includes>
<excludes>
- <exclude>alert-aggregator-webapp/src/main/webapp/dojo</exclude>
- <exclude>alert-aggregator-webapp/src/main/webapp/dojo/**/*</exclude>
- <exclude>alert-aggregator-webapp/target/demo-alert-aggregator</exclude>
- <exclude>alert-aggregator-webapp/target/demo-alert-aggregator/**/*</exclude>
- <exclude>alert-aggregator-webapp/target/sdo-source</exclude>
- <exclude>alert-aggregator-webapp/target/sdo-source/**/*</exclude>
- <exclude>helloworld-ws-sdo/work</exclude>
- <exclude>helloworld-ws-sdo/work/**/*</exclude>
- <exclude>bigbank/target</exclude>
- <exclude>bigbank/target/**/*</exclude>
- <exclude>bigbank-account/src/main/resources/web/dojo</exclude>
- <exclude>bigbank-account/src/main/resources/web/dojo/**/*</exclude>
- <exclude>secure-bigbank/secure-bigbank-account/src/main/resources/web/dojo</exclude>
- <exclude>secure-bigbank/secure-bigbank-account/src/main/resources/web/dojo/**/*</exclude>
- <exclude>mortgage-creditcheck/target/demo-mortgage-creditcheck</exclude>
- <exclude>mortgage-creditcheck/target/demo-mortgage-creditcheck/**/*</exclude>
<exclude>*/.classpath</exclude>
<exclude>*/.project</exclude>
<exclude>*/.settings</exclude>
@@ -205,20 +195,42 @@
<exclude>*/target/test-classes/**/*</exclude>
<exclude>*/target/surefire-reports</exclude>
<exclude>*/target/surefire-reports/**/*</exclude>
+ <exclude>**/derby.log</exclude>
+ <exclude>*/**/derby.log</exclude>
<exclude>*/**/*.svg</exclude>
<exclude>*/**/*.ruleset</exclude>
+ <exclude>alert-aggregator-webapp/bin</exclude>
+ <exclude>alert-aggregator-webapp/bin/**/*</exclude>
+ <exclude>alert-aggregator-webapp/src/main/webapp/dojo</exclude>
+ <exclude>alert-aggregator-webapp/src/main/webapp/dojo/**/*</exclude>
+ <exclude>alert-aggregator-webapp/target/demo-alert-aggregator</exclude>
+ <exclude>alert-aggregator-webapp/target/demo-alert-aggregator/**/*</exclude>
+ <exclude>alert-aggregator-webapp/target/sdo-source</exclude>
+ <exclude>alert-aggregator-webapp/target/sdo-source/**/*</exclude>
<exclude>alert-aggregator-webapp/target</exclude>
<exclude>alert-aggregator-webapp/target/**/*</exclude>
+ <exclude>bigbank/src/main/resources/web/dojo</exclude>
+ <exclude>bigbank/src/main/resources/web/dojo/**/*</exclude>
+ <exclude>bigbank/target</exclude>
+ <exclude>bigbank/target/**/*</exclude>
+ <exclude>bigbank-account/src/main/resources/web/dojo</exclude>
+ <exclude>bigbank-account/src/main/resources/web/dojo/**/*</exclude>
<exclude>bigbank-account/target</exclude>
<exclude>bigbank-account/target/**/*</exclude>
<exclude>bigbank-calculator/target</exclude>
<exclude>bigbank-calculator/target/**/*</exclude>
<exclude>bigbank-stockquote/target</exclude>
<exclude>bigbank-stockquote/target/**/*</exclude>
+ <exclude>helloworld-ws-sdo/work</exclude>
+ <exclude>helloworld-ws-sdo/work/**/*</exclude>
+ <exclude>mortgage-creditcheck/target/demo-mortgage-creditcheck</exclude>
+ <exclude>mortgage-creditcheck/target/demo-mortgage-creditcheck/**/*</exclude>
<exclude>mortgage-creditcheck/target</exclude>
<exclude>mortgage-creditcheck/target/**/*</exclude>
<exclude>mortgage-loanapproval/target</exclude>
<exclude>mortgage-loanapproval/target/**/*</exclude>
+ <exclude>secure-bigbank/secure-bigbank-account/src/main/resources/web/dojo</exclude>
+ <exclude>secure-bigbank/secure-bigbank-account/src/main/resources/web/dojo/**/*</exclude>
<exclude>secure-bigbank/secure-bigbank-account/target</exclude>
<exclude>secure-bigbank/secure-bigbank-account/target/**/*</exclude>
<exclude>secure-bigbank/secure-bigbank-calculator/target</exclude>
@@ -252,6 +264,9 @@
<exclude>*/target/test-classes/**/*</exclude>
<exclude>*/target/surefire-reports</exclude>
<exclude>*/target/surefire-reports/**/*</exclude>
+ <exclude>*/target/war</exclude>
+ <exclude>*/target/war/**/*</exclude>
+ <exclude>**/derby.log</exclude>
<exclude>*/**/derby.log</exclude>
<exclude>*/**/*.svg</exclude>
<exclude>*/**/*.ruleset</exclude>
@@ -261,6 +276,12 @@
<exclude>catalog-webapp/target/war/**/*</exclude>
<exclude>catalog-webapp/target/tutorial-catalog-webapp</exclude>
<exclude>catalog-webapp/target/tutorial-catalog-webapp/**/*</exclude>
+ <exclude>store-db/target/cart-db/</exclude>
+ <exclude>store-db/target/cart-db/**/*</exclude>
+ <exclude>store-eu/target/cart-eu-db/</exclude>
+ <exclude>store-eu/target/cart-eu-db/**/*</exclude>
+ <exclude>store-supplier/target/cart-db/</exclude>
+ <exclude>store-supplier/target/cart-db/**/*</exclude>
</excludes>
</fileSet>
<!-- Add the generated tuscany manifest classpath jar to the lib directory -->
Modified: incubator/tuscany/java/sca/distribution/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/src/main/assembly/src.xml?rev=649731&r1=649730&r2=649731&view=diff
==============================================================================
--- incubator/tuscany/java/sca/distribution/src/main/assembly/src.xml (original)
+++ incubator/tuscany/java/sca/distribution/src/main/assembly/src.xml Fri Apr 18 17:23:34 2008
@@ -80,26 +80,36 @@
<exclude>**/var/journal</exclude>
<exclude>**/build.out*</exclude>
<exclude>velocity.log</exclude>
- <exclude>*/work</exclude>
- <exclude>*/work/**/*</exclude>
<exclude>distribution/target-last-successful</exclude>
<exclude>distribution/target-last-successful/**/*</exclude>
<exclude>itest/velocity.log</exclude>
+ <exclude>itest/callablereferences/work</exclude>
+ <exclude>itest/callablereferences/work/**/*</exclude>
+ <exclude>itest/callablereferences-ws/work</exclude>
+ <exclude>itest/callablereferences-ws/work/**/*</exclude>
+ <exclude>itest/contribution-import-export/import-composite/work</exclude>
+ <exclude>itest/contribution-import-export/import-composite/work/**/*</exclude>
+ <exclude>itest/contribution-import-export/import-resource/work</exclude>
+ <exclude>itest/contribution-import-export/import-resource/work/**/*</exclude>
+ <exclude>itest/contribution-import-export/import-wsdl/work</exclude>
+ <exclude>itest/contribution-import-export/import-wsdl/work/**/*</exclude>
+ <exclude>itest/conversations-ws/work</exclude>
+ <exclude>itest/conversations-ws/work/**/*</exclude>
<exclude>itest/databindings/jaxbgen/velocity.log</exclude>
- <exclude>itest/old</exclude>
- <exclude>itest/old/**/*</exclude>
+ <exclude>itest/domain/work</exclude>
+ <exclude>itest/domain/work/**/*</exclude>
<exclude>itest/exceptions-simple-ws/work</exclude>
<exclude>itest/exceptions-simple-ws/work/**/*</exclude>
- <exclude>itest/callablereferences/work</exclude>
- <exclude>itest/callablereferences/work/**/*</exclude>
- <exclude>itest/large-sdo-ws/work</exclude>
- <exclude>itest/large-sdo-ws/work/**/*</exclude>
+ <exclude>itest/large-sdo-ws/</exclude>
+ <exclude>itest/large-sdo-ws/**/*</exclude>
+ <exclude>itest/policy/work</exclude>
+ <exclude>itest/policy/work/**/*</exclude>
+ <exclude>itest/transaction/derbydb</exclude>
+ <exclude>itest/transaction/derbydb/**/*</exclude>
<exclude>itest/ws-void-args-return/work</exclude>
<exclude>itest/ws-void-args-return/work/**/*</exclude>
- <exclude>itest/contribution-import-export/import-wsdl/work</exclude>
- <exclude>itest/contribution-import-export/import-wsdl/work/**/*</exclude>
- <exclude>itest/contribution-import-export/import-composite/work</exclude>
- <exclude>itest/contribution-import-export/import-composite/work/**/*</exclude>
+ <exclude>modules/domain-impl/work</exclude>
+ <exclude>modules/domain-impl/work/**/*</exclude>
<exclude>modules/host-tomcat/work</exclude>
<exclude>modules/host-tomcat/work/**/*</exclude>
<exclude>modules/node-impl/work</exclude>
@@ -109,12 +119,10 @@
<exclude>modules/implementation-das/**/*</exclude>
<exclude>modules/implementation-data</exclude>
<exclude>modules/implementation-data/**/*</exclude>
- <exclude>modules/implementation-ejb</exclude>
- <exclude>modules/implementation-ejb/**/*</exclude>
- <exclude>modules/implementation-ejb-xml</exclude>
- <exclude>modules/implementation-ejb-xml/**/*</exclude>
<exclude>modules/implementation-osgi/.felix</exclude>
<exclude>modules/implementation-osgi/.felix/**/*</exclude>
+ <exclude>modules/osgi-runtime/.felix</exclude>
+ <exclude>modules/osgi-runtime/.felix/**/*</exclude>
<exclude>samples/old</exclude>
<exclude>samples/old/**/*</exclude>
<exclude>samples/calculator-distributed/work</exclude>
@@ -123,14 +131,6 @@
<exclude>samples/callback-ws-client/work/**/*</exclude>
<exclude>samples/callback-ws-service/work</exclude>
<exclude>samples/callback-ws-service/work/**/*</exclude>
- <exclude>samples/company-das</exclude>
- <exclude>samples/company-das/**/*</exclude>
- <exclude>samples/company-das-webapp</exclude>
- <exclude>samples/company-das-webapp/**/*</exclude>
- <exclude>samples/das-service</exclude>
- <exclude>samples/das-service/**/*</exclude>
- <exclude>samples/das-service-web</exclude>
- <exclude>samples/das-service-web/**/*</exclude>
<exclude>samples/domain-webapp</exclude>
<exclude>samples/domain-webapp/**/*</exclude>
<exclude>samples/helloworld-jsonrpc-webapp/src/main/webapp/dojo</exclude>
@@ -163,12 +163,17 @@
<exclude>samples/spi-implementation-pojo/**/*</exclude>
<exclude>samples/simple-callback-ws/work</exclude>
<exclude>samples/simple-callback-ws/work/**/*</exclude>
+ <exclude>demos/alert-aggregator-webapp/bin</exclude>
+ <exclude>demos/alert-aggregator-webapp/bin/**/*</exclude>
<exclude>demos/alert-aggregator-webapp/src/main/webapp/dojo</exclude>
<exclude>demos/alert-aggregator-webapp/src/main/webapp/dojo/**/*</exclude>
+ <exclude>demos/bigbank/src/main/resources/web/dojo</exclude>
+ <exclude>demos/bigbank/src/main/resources/web/dojo/**/*</exclude>
<exclude>demos/bigbank-account/src/main/resources/web/dojo</exclude>
<exclude>demos/bigbank-account/src/main/resources/web/dojo/**/*</exclude>
<exclude>demos/secure-bigbank/secure-bigbank-account/src/main/resources/web/dojo</exclude>
<exclude>demos/secure-bigbank/secure-bigbank-account/src/main/resources/web/dojo/**/*</exclude>
+ <exclude>*/**/derby.log</exclude>
<exclude>*/**/*.svg</exclude>
<exclude>*/**/*.ruleset</exclude>
<exclude>*/**/*.pmd</exclude>
Modified: incubator/tuscany/java/sca/distribution/src/main/release/CHANGES
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/src/main/release/CHANGES?rev=649731&r1=649730&r2=649731&view=diff
==============================================================================
--- incubator/tuscany/java/sca/distribution/src/main/release/CHANGES (original)
+++ incubator/tuscany/java/sca/distribution/src/main/release/CHANGES Fri Apr 18 17:23:34 2008
@@ -1,3 +1,105 @@
+Changes With Apache Tuscany SCA 1.2 (incubating) April 2008
+===========================================================
+
+- Fix the following JIRA issues (http://issues.apache.org/jira/browse/TUSCANY):
+ * TUSCANY-2027
+ * TUSCANY-1999
+ * TUSCANY-2037
+ * TUSCANY-2034
+ * TUSCANY-2038
+ * TUSCANY-2043
+ * TUSCANY-2046
+ * TUSCANY-2047
+ * TUSCANY-2028
+ * TUSCANY-1873
+ * TUSCANY-2049
+ * TUSCANY-2035
+ * TUSCANY-1206
+ * TUSCANY-2036
+ * TUSCANY-1771
+ * TUSCANY-2013
+ * TUSCANY-1926
+ * TUSCANY-1917
+ * TUSCANY-1949
+ * TUSCANY-1941
+ * TUSCANY-2045
+ * TUSCANY-2057
+ * TUSCANY-2055
+ * TUSCANY-2056
+ * TUSCANY-2072
+ * TUSCANY-2047
+ * TUSCANY-2073
+ * TUSCANY-1977
+ * TUSCANY-2075
+ * TUSCANY-1894
+ * TUSCANY-2079
+ * TUSCANY-2078
+ * TUSCANY-2080
+ * TUSCANY-2068
+ * TUSCANY-1950
+ * TUSCANY-2077
+ * TUSCANY-2056
+ * TUSCANY-2088
+ * TUSCANY-2086
+ * TUSCANY-2094
+ * TUSCANY-2106
+
+ Features and/or Enhancements
+
+ * Core
+ - Interceptor Enhancements
+ - Phase-based interceptor ordering to allow contribution of new interceptors and also define the order in witch they should be invoked
+ - Pass-by-reference SPI to allow interceptors to indicate if they support pass-by-reference
+ - PolicyProvider SPIs to allow extensions to plugin policy interceptors
+ - Support for JAXWS annotations and mapping of faults to Java exceptions according to JAXWS specification
+ - Improvement of contribution service to allow it to be used outside of the runtime environment
+ - Support for Contribution Import/Export resource
+ - Enhanced Distributed Domain story using Workspace
+ - Implementation of a SCA domain allowing a system administrator to manage contributions, composites and sca nodes that run these composites
+ - Set of core services providing management capabilities
+ - Administration web interface
+ - This is a work in progress and you can see it in action in samples/calculator-distributed. Other samples that use distributed operation are yet to move over to the workspace.
+ - Enhanced support for SCA Policy spec
+ - Ability to apply external policy definitions to a SCA composition
+ - Ability to spread policy definitions to multiple definitions.xml files available across the sca domain
+ - Bug fixes
+ - Improvements of http binding to support servlet components
+ - Enable Tuscany to run inside an OSGi runtime
+
+ * Web 2.0 Extensions
+ - Enhancements to implementation.widget (support for properties)
+ - New atom binding based on Apache Abdera
+ - Refactoring of rss-rome binding
+ * Other Extensions
+ - Binding JMS
+ - greatly simplified the use of the JMS binding, support locating JMS resources from JNDI, and better compliance with the SCA JMS binding spec
+ - see the doc page for more details: http://incubator.apache.org/tuscany/sca-java-bindingjms.html
+ - Enhancements to Binding RMI
+ - Support shared RMI registry and use 999x as the ports in test case to avoid 1099 conflict
+ - Enhancements to Groovy extension
+ - Support for 'native' groovy classes
+ - Enhancements to OSGi bundle contributions
+ - Support Bundle URLs to be added as contributions
+
+ * Tools
+ - Eclipse plugin providing a Tuscany runtime Library and Tuscany launcher in Eclipse environment
+ - An updatesite is also available to facilitate the plugin installation using the Eclipse update manager
+
+ * Samples/Tutorial/Demos
+ - calculator-distributed migrated to use new Tuscany Distributed Workspace
+ - sample-calculator-ws-secure-webapp
+ - sample-helloworld-jms-webapp
+ - new jms samples
+ - improve bigbank demo to include support for policies
+ - tutorial store changes
+ - use of import/export
+ - development of contribution without requiring dependencies on the Tuscany runtime
+ - usage of new sca domain infrastructure
+
+ * Testing
+ - Web Container Testing Framework integrated with (Tomcat, Jetty, Geronimo and Websphere)
+
+
Changes With Apache Tuscany SCA 1.1 (incubating) January 2008
===============================================================
Modified: incubator/tuscany/java/sca/distribution/src/main/release/README
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/src/main/release/README?rev=649731&r1=649730&r2=649731&view=diff
==============================================================================
--- incubator/tuscany/java/sca/distribution/src/main/release/README (original)
+++ incubator/tuscany/java/sca/distribution/src/main/release/README Fri Apr 18 17:23:34 2008
@@ -1,7 +1,7 @@
-Apache Tuscany SCA 1.1 (incubating) January 2008 README
-=======================================================
+Apache Tuscany SCA 1.2 (incubating) April 2008 README
+=====================================================
-Welcome to the Tuscany SCA 1.1 release.
+Welcome to the Tuscany SCA 1.2 release.
See the RELEASE_NOTES file for information specific to this release.
Modified: incubator/tuscany/java/sca/distribution/src/main/release/RELEASE_NOTES
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/src/main/release/RELEASE_NOTES?rev=649731&r1=649730&r2=649731&view=diff
==============================================================================
--- incubator/tuscany/java/sca/distribution/src/main/release/RELEASE_NOTES (original)
+++ incubator/tuscany/java/sca/distribution/src/main/release/RELEASE_NOTES Fri Apr 18 17:23:34 2008
@@ -1,5 +1,5 @@
-Apache Tuscany SCA 1.1 (incubating) January 2008 Release Notes
-==============================================================
+Apache Tuscany SCA 1.2 (incubating) April 2008 Release Notes
+============================================================
Apache Tuscany provides a runtime based on the Service Component
Architecture. SCA is a set of specifications aimed at simplifying SOA
@@ -9,7 +9,7 @@
Overview
--------
- The Apache Tuscany SCA 1.1 release includes implementations of the
+ The Apache Tuscany SCA 1.2 release includes implementations of the
main SCA specifications including:
SCA Assembly Model V1.0
Modified: incubator/tuscany/java/sca/distribution/src/main/release/bin/INSTALL
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/src/main/release/bin/INSTALL?rev=649731&r1=649730&r2=649731&view=diff
==============================================================================
--- incubator/tuscany/java/sca/distribution/src/main/release/bin/INSTALL (original)
+++ incubator/tuscany/java/sca/distribution/src/main/release/bin/INSTALL Fri Apr 18 17:23:34 2008
@@ -1,5 +1,5 @@
-Installing the Apache Tuscany SCA 1.1 (incubating) January 2008 Release binary distribution
-===========================================================================================
+Installing the Apache Tuscany SCA 1.2 (incubating) April 2008 Release binary distribution
+=========================================================================================
Unzip Tuscany binary distribution archive and you get the following:
@@ -14,13 +14,13 @@
/demos - Demo applications showcasing the use of Apache Tuscany
- /doc - Javadoc for the SCA APIs and the Tuscany SPIs
-
/lib - The tuscany-sca-all and tuscany-sca-manifest jars and all their dependencies
/modules - all of the individual Tuscany jars
/samples - all the Tuscany samples, see the README in that directory
+
+ /tutorial - The store tutorial, see the README in that directory
Modified: incubator/tuscany/java/sca/distribution/src/main/release/bin/LICENSE
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/src/main/release/bin/LICENSE?rev=649731&r1=649730&r2=649731&view=diff
==============================================================================
--- incubator/tuscany/java/sca/distribution/src/main/release/bin/LICENSE (original)
+++ incubator/tuscany/java/sca/distribution/src/main/release/bin/LICENSE Fri Apr 18 17:23:34 2008
@@ -215,30 +215,31 @@
The following components come under Apache Software License 1.1
- commons-cli-1.0.jar
commons-discovery-0.2.jar
commons-primitives-1.0.jar
The following components come under Apache Software License 2.0
+ abdera-core-0.3.0-incubating.jar
+ abdera-i18n-0.3.0-incubating.jar
+ abdera-parser-0.3.0-incubating.jar
activeio-2.0-r118.jar
activeio-core-3.0.0-incubator.jar
- activemq-core-4.1.1.jar
+ apache-activemq-4.1.1.jar
addressing-1.3.mar
annogen-0.1.0.jar
- annotations-api-6.0.10.jar
+ annotations-api-6.0.14.jar
aopalliance-1.0.jar
axiom-api-1.2.5.jar
axiom-dom-1.2.5.jar
axiom-impl-1.2.5.jar
axis2-adb-1.3.jar
- axis2-adb-codegen-1.3.jar
axis2-codegen-1.3.jar
axis2-java2wsdl-1.3.jar
axis2-kernel-1.3.jar
axis2-mtompolicy-1.3.jar
bsf-all-3.0-beta2.jar
- catalina-6.0.10.jar
+ catalina-6.0.14.jar
cglib-nodep-2.1_3.jar
commons-collections-3.1.jar
commons-codec-1.3.jar
@@ -248,7 +249,7 @@
commons-jexl-1.1.jar
commons-lang-2.1.jar
commons-logging-1.1.jar
- coyote-6.0.10.jar
+ coyote-6.0.14.jar
derby-10.1.3.1.jar
geronimo-activation_1.1_spec-1.0-M1.jar
geronimo-common-1.2-beta.jar
@@ -258,12 +259,12 @@
geronimo-deployment-1.2-beta.jar
geronimo-ejb_3.0_spec-1.0.jar
geronimo-interceptor-1.2-beta.jar
- geronimo-jms_1.1_spec-1.1.jar
geronimo-j2ee-1.2-beta.jar
geronimo-j2ee-connector_1.5_spec-1.1.jar
geronimo-j2ee-jacc_1.0_spec-1.1.jar
geronimo-j2ee-management_1.0_spec-1.1.jar
geronimo-javamail_1.4_spec-1.0-M1.jar
+ geronimo-jms_1.1_spec-1.1.jar
geronimo-jpa_3.0_spec-1.0.jar
geronimo-jta_1.0.1B_spec-1.0.jar
geronimo-kernel-1.2-beta.jar
@@ -279,20 +280,12 @@
httpcore-nio-4.0-alpha5.jar
httpcore-niossl-4.0-alpha5.jar
jettison-1.0-RC2.jar
- jetty-6.1.3.jar
- jetty-util-6.1.3.jar
+ jetty-6.1.7.jar
+ jetty-util-6.1.7.jar
json-rpc-1.0.jar
- juli-6.0.10.jar
+ juli-6.0.14.jar
log4j-1.2.12.jar
logkit-1.0.1.jar
- maven-artifact-2.0.2.jar
- maven-artifact-manager-2.0.2.jar
- maven-error-diagnostics-2.0.2.jar
- maven-model-2.0.2.jar
- maven-profile-2.0.2.jar
- maven-project-2.0.2.jar
- maven-repository-metadata-2.0.2.jar
- maven-settings-2.0.2.jar
neethi-2.0.2.jar
ode-bpel-api-1.1.jar
ode-bpel-compiler-1.1.jar
@@ -310,15 +303,11 @@
ode-utils-1.1.jar
openjpa-all-0.9.7-incubating.jar
openjpa-persistence-0.9.7-incubating.jar
- opensaml-1.1.jar
- org.apache.felix.bundlerepository-1.0.0.jar
- org.apache.felix.framework-1.0.1.jar
- org.apache.felix.main-1.0.1.jar
+ org.apache.felix.bundlerepository-1.0.2.jar
+ org.apache.felix.framework-1.0.3.jar
+ org.apache.felix.main-1.0.3.jar
org.apache.felix.shell-1.0.0.jar
org.apache.felix.shell.tui-1.0.0.jar
- plexus-container-default-1.0-alpha-9.jar
- plexus-utils-1.1.jar
- rampart-1.3.mar
rampart-core-1.3.jar
rampart-policy-1.3.jar
rampart-trust-1.3.jar
@@ -331,54 +320,117 @@
tuscany-sdo-impl-1.0-incubating.jar
tuscany-sdo-lib-1.0-incubating.jar
tuscany-sdo-tools-1.0-incubating.jar
- wagon-file-1.0-alpha-7.jar
- wagon-http-lightweight-1.0-alpha-6.jar
- wagon-provider-api-1.0-alpha-6.jar
woden-1.0-incubating-M7b.jar
wss4j-1.5.3.jar
wstx-asl-3.2.1.jar
xalan-2.7.0.jar
- xbean-2.1.0.jar
- xmlbeans-2.3.0.jar
xbean-naming-2.7.jar
xercesImpl-2.8.1.jar
xml-apis-1.3.03.jar
+ xmlbeans-2.3.0.jar
xml-resolver-1.1.jar
xmlsec-1.4.0.jar
XmlSchema-1.3.2.jar
-
+
===============================================================================
+axion-1.0-M3-dev.jar
-jaxen-1.1-beta-9.jar:
+Copyright (c) 2002-2003 Axion Development Team. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
- Copyright 2003-2006 The Werken Company. All Rights Reserved.
+1. Redistributions of source code must retain the above
+ copyright notice, this list of conditions and the following
+ disclaimer.
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+
+3. The names "Tigris", "Axion", nor the names of its contributors may
+ not be used to endorse or promote products derived from this
+ software without specific prior written permission.
+
+4. Products derived from this software may not be called "Axion", nor
+ may "Tigris" or "Axion" appear in their names without specific prior
+ written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+The "Axion Development Team" is defined to be:
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
+ * Chuck Burdick
+ * James Burke
+ * Morgan Delagrange
+ * Geir Magnusson Jr.
+ * Martin Poeschl
+ * Steve Polyak
+ * Daniel Rall
+ * Ahimanikya Satapathy
+ * Doug Sale
+ * James Strachan
+ * Rodney Waldhoff
+ * Jason van Zyl
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- * Neither the name of the Jaxen Project nor the names of its
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+License changes are to be determined by a simple majority vote of the
+Axion Development Team.
+
+===============================================================================
+dom4j-1.6.1.jar
+
+Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
+
+Redistribution and use of this software and associated documentation
+("Software"), with or without modification, are permitted provided
+that the following conditions are met:
+
+1. Redistributions of source code must retain copyright
+ statements and notices. Redistributions must also contain a
+ copy of this document.
+
+2. Redistributions in binary form must reproduce the
+ above copyright notice, this list of conditions and the
+ following disclaimer in the documentation and/or other
+ materials provided with the distribution.
+
+3. The name "DOM4J" must not be used to endorse or promote
+ products derived from this Software without prior written
+ permission of MetaStuff, Ltd. For written permission,
+ please contact dom4j-info@metastuff.com.
+
+4. Products derived from this Software may not be called "DOM4J"
+ nor may "DOM4J" appear in their names without prior written
+ permission of MetaStuff, Ltd. DOM4J is a registered
+ trademark of MetaStuff, Ltd.
+
+5. Due credit should be given to the DOM4J Project -
+ http://www.dom4j.org
+
+THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
+NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+METASTUFF, LTD. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+OF THE POSSIBILITY OF SUCH DAMAGE.
===============================================================================
@@ -1233,7 +1285,7 @@
===============================================================================
-Groovy:
+Groovy (groovy-all-minimal-1.5.4.jar):
/*
$Id: LICENSE.txt 156 2003-09-26 17:36:37Z jstrachan $
@@ -1283,7 +1335,7 @@
===============================================================================
-Jython:
+Jython (jython-2.2.jar):
A. HISTORY OF THE SOFTWARE
=======================
@@ -1430,8 +1482,19 @@
===============================================================================
-The jars; activation, jaxb-api, jaxb-impl, jaxb-xjc, jaxb2-reflection, jsr181-api,
-jsr250-api, jaxws-api, mail, saaj-api, servlet-api-2.5.jar, stax-api-1.0.2.jar:
+The jars;
+activation-1.1.jar,
+jaxb-api-2.1.jar,
+jaxb-impl-2.1.6.jar,
+jaxb-xjc-2.1.4.jar,
+jaxb2-reflection-2.1.4.jar,
+jsr181-api-1.0-MR1.jar,
+jsr250-api-1.0.jar,
+jaxws-api-2.1-1.jar,
+mail-1.4.jar,
+saaj-api-1.3.jar,
+servlet-api-2.5.jar,
+stax-api-1.0-commons-cli-1.0.jar2.jar
COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
@@ -1820,7 +1883,7 @@
===============================================================================
-JRuby, wsdl4j:
+JRuby (jruby-complete-1.0.jar), wsdl4j (wsdl4j-1.6.2.jar):
Common Public License - v 1.0
@@ -1911,7 +1974,7 @@
===============================================================================
-backport-util-concurrent:
+backport-util-concurrent-2.2.jar:
The software comprising backport-util-concurrent is based in large
part on the code from JSR166, and the package dl.util.concurrent.
@@ -2054,7 +2117,7 @@
==========================================================================
-dojotoolkit :
+dojotoolkit V1.0.0:
The "New" BSD License:
**********************
@@ -2127,7 +2190,7 @@
================================================================================
-The serp jar is distributed under the BSD license with the following copyright:
+The serp-1.12.0.jar is distributed under the BSD license with the following copyright:
Copyright (c) 2002, A. Abram White
All rights reserved.
@@ -2165,7 +2228,7 @@
DAMAGE.
================================================================================
-The axion, javacc, and howl are distributed under the BSD license:
+The javacc-3.2.jar, and howl-1.0.1-1.jar are distributed under the BSD license:
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
Modified: incubator/tuscany/java/sca/distribution/src/main/release/bin/NOTICE
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/src/main/release/bin/NOTICE?rev=649731&r1=649730&r2=649731&view=diff
==============================================================================
--- incubator/tuscany/java/sca/distribution/src/main/release/bin/NOTICE (original)
+++ incubator/tuscany/java/sca/distribution/src/main/release/bin/NOTICE Fri Apr 18 17:23:34 2008
@@ -22,14 +22,21 @@
This product includes/uses the Groovy Script Engine (http://groovy.codehaus.org/),
Copyright 2003 (C) James Strachan and Bob Mcwhirter. All Rights Reserved.
-This product includes/uses the Jaxen XPATH engine (http://jaxen.org/)
- Copyright 2003-2006 The Werken Company. All Rights Reserved.
+This product includes/uses the Axion : the Open Source Java Database (http://axion.tigris.org/)
+ Copyright (c) 2002-2003 Axion Development Team. All rights reserved.
+
+This product includes/uses DOM4J : the flexible XML framework for java (http://www.dom4j.org/)
+ Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
This product includes/uses software, AOP alliance (http://aopalliance.sourceforge.net)
License: Public Domain
This product includes/uses JSON-RPC-Java (http://oss.metaparadigm.com/jsonrpc/)
+This product includes/uses JSON-RPC JavaScript client (jsonrpc.js)
+ Copyright (c) 2003-2004 Jan-Klaas Kollhof
+ Copyright (c) 2005 Michael Clark, Metaparadigm Pte Ltd
+
This product includes software from the GlassFish project (https://glassfish.dev.java.net/)
Copyright (c) 2006, Sun Microsystems, Inc.
@@ -72,15 +79,11 @@
This product also includes software under the BSD license
with the following copyright:
+ Copyright (c) 2006, Sun Microsystems, Inc. All rights reserved.
- Copyright (c) 2006, Sun Microsystems, Inc.
- All rights reserved.
-
-This product also includes software under the OSOA license
-(see the LICENSE file contained in this distribution), with
-the following copyright:
-
-(c) Copyright SCA Collaboration 2006, 2007
+This product includes software under the Service Component Architecture JavaDoc,
+Interface Definition files and XSD files license.
+ (c) Copyright SCA Collaboration 2006, 2007
This product includes software under the Service Data Objects JavaDoc and
Interface Definition file license
@@ -89,8 +92,4 @@
Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG.,
Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies,
2005, 2006. All rights reserved.
-
-Please see the LICENSE file present in the root directory of this
-distribution.
-
Modified: incubator/tuscany/java/sca/distribution/src/main/release/src/BUILDING
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/src/main/release/src/BUILDING?rev=649731&r1=649730&r2=649731&view=diff
==============================================================================
--- incubator/tuscany/java/sca/distribution/src/main/release/src/BUILDING (original)
+++ incubator/tuscany/java/sca/distribution/src/main/release/src/BUILDING Fri Apr 18 17:23:34 2008
@@ -1,20 +1,27 @@
-Building the Apache Tuscany SCA 1.1 (incubating) January 2008 Release source distribution
-=========================================================================================
+Building the Apache Tuscany SCA 1.2 (incubating) April 2008 Release source distribution
+=======================================================================================
Initial Setup
-------------
1) Install J2SE 5.0 SDK, which can be downloaded from
- http://java.sun.com/j2se/1.5.0/download.jsp. Use version of 1.5.0_06 JDK.
+ http://java.sun.com/j2se/1.5.0/download.jsp. Use version of 1.5.0_06 JDK or higher.
2) Make sure that your JAVA_HOME environment variable is set to the newly installed
JDK location, and that your PATH includes %JAVA_HOME%\bin (windows) or
$JAVA_HOME$/bin (unix).
-3) Install Maven 2.0.5, which can be downloaded from
+3) Install Maven 2.0.7 or higher, which can be downloaded from
http://maven.apache.org/download.html. Make sure that your PATH includes
the MVN_HOME/bin directory.
+4) Make sure that your MAVEN_OPTS environment variable has -Xmx128M (or more),
+ you can manually do this by executing the following in your prompt :
+ Windows users:
+ set MAVEN_OPTS=-Xmx128M
+ Unix users:
+ export MAVEN_OPTS=-Xmx128M
+
Building
--------
@@ -38,7 +45,7 @@
Building the distributions
--------------------------
-1) Change to the distributions folder
+1) Change to the distribution folder
2) Run
$> mvn
Modified: incubator/tuscany/java/sca/distribution/src/main/release/src/LICENSE
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/src/main/release/src/LICENSE?rev=649731&r1=649730&r2=649731&view=diff
==============================================================================
--- incubator/tuscany/java/sca/distribution/src/main/release/src/LICENSE (original)
+++ incubator/tuscany/java/sca/distribution/src/main/release/src/LICENSE Fri Apr 18 17:23:34 2008
@@ -217,34 +217,47 @@
The module itest/databindings/common includes the test schema; datagraph.xsd, sdoJava.xsd, and sdoModel.xsd
under the following license:
-License for the Service Data Objects JavaDoc and Interface Definition files. (sdo-api-r2.0.1-1.0-incubator-M2.jar)
+License for the Service Data Objects JavaDoc, Interface Definition files
+and XSD files.
-Permission to copy, make derivative works of, and distribute the Service Data Objects
-JavaDoc and Interface Definition Files files in any medium without fee or royalty as part
-of a compliant implementation of the Service Data Objects Specification is hereby granted.
-The Service Data Objects Specification may be found at any of the following locations:
-
-http://dev2dev.bea.com/technologies/commonj/index.jsp
-http://www.ibm.com/developerworks/library/specification/ws-sdo/
-http://oracle.com/technology/webservices/sca
-https://www.sdn.sap.com/
-http://www.xcalia/xdn/specs/sdo
-
-THE SERVICE DATA OBJECTS SPECIFICATION AND THE JAVADOC AND INTERFACE DEFINITION FILES
-ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS
-SPECIFICATION OR THE JAVADOC AND INTERFACE DEFINITION FILES AND THE IMPLEMENTATION OF THEIR CONTENTS,
-INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE,
-NON-INFRINGEMENT OR TITLE. THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL,
-INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR DISTRIBUTION OF THE
-SERVICE DATA OBJECTS SPECIFICATION OR THE JAVADOC OR INTERFACE DEFINTION FILES.
-
-The name and trademarks of the Authors may NOT be used in any manner, including advertising or
-publicity pertaining to the Service Component Architecture Specification or its contents without specific,
-written prior permission. Title to copyright in the Service Data Objects Specification and the
-JavaDoc and Interface Definition Files will at all times remain with the Authors.
+The Service Data Objects JavaDoc, Interface Definition files and XSD files
+are being provided by the copyright holders under the following license.
+By using and/or copying this work, you agree that you have read,
+understood and will comply with the following terms and conditions:
+
+Permission to copy, display, make derivative works of and distribute
+the Service Data Objects JavaDoc, Interface Definition files and XSD files
+(the "Artifacts") in any medium without fee or royalty is hereby granted,
+provided that you include the following on ALL copies of the Artifacts,
+or portions thereof, that you make:
+
+1. A link or URL to the Artifacts at this location:
+http://www.osoa.org/display/Main/Service+Data+Objects+Specifications
+
+2. The full text of this copyright notice as shown in the Artifacts.
+
+
+
+THE ARTIFACTS ARE PROVIDED "AS IS" AND THE AUTHORS MAKE NO
+REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THE
+ARTIFACTS AND THE IMPLEMENTATION OF THEIR CONTENTS,
+INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE.
+
+THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL,
+INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY
+USE OR DISTRIBUTION OF THE ARTIFACTS.
+
+The name and trademarks of the Authors may NOT be used in any manner,
+including advertising or publicity pertaining to the Service Data
+Objects Specification or its contents without specific, written prior
+permission. Title to copyright in the Service Data Objects
+Specification will at all times remain with the Authors.
No other rights are granted by implication, estoppel or otherwise.
+Revision level 1.11, last updated on 2007/12/21
+
=================================================================================================================
The module implementation-script temporarily includes one file under the following BSD license:
@@ -328,3 +341,57 @@
Revision level 1.1, last updated on 2007/11/19
=================================================================================================================
+The modules
+
+binding-ws-xml
+databinding
+databinding-axiom
+databinding-jaxb
+databinding-json
+databinding-sdo
+databinding-sdo-axiom
+databinding-xmlbeans
+interface-wsdl-xml
+
+Include the ipo.xsd and address.xsd information from the XML Schema Primer
+(http://www.w3.org/TR/2004/PER-xmlschema-0-20040318/) combined into the
+file ipo.xsd and extended with UK postcode structures.
+
+The ipo.xsd file is include under the following license:
+
+W3C(c) SOFTWARE NOTICE AND LICENSE
+http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+
+This work (and included software, documentation such as READMEs, or other
+related items) is being provided by the copyright holders under the following
+license. By obtaining, using and/or copying this work, you (the licensee) agree
+that you have read, understood, and will comply with the following terms and conditions.
+
+Permission to copy, modify, and distribute this software and its documentation,
+with or without modification, for any purpose and without fee or royalty is
+hereby granted, provided that you include the following on ALL copies of the
+software and documentation or portions thereof, including modifications:
+
+ 1. The full text of this NOTICE in a location viewable to users of the
+ redistributed or derivative work.
+ 2. Any pre-existing intellectual property disclaimers, notices, or terms
+ and conditions. If none exist, the W3C Software Short Notice should be
+ included (hypertext is preferred, text is permitted) within the body of
+ any redistributed or derivative code.
+ 3. Notice of any changes or modifications to the files, including the date
+ changes were made. (We recommend you provide URIs to the location from which
+ the code is derived.)
+
+THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE
+NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO,
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE
+USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS,
+COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
+
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the software without specific, written prior permission.
+Title to copyright in this software and any associated documentation will at all
+times remain with copyright holders.
Modified: incubator/tuscany/java/sca/distribution/src/main/release/src/NOTICE
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/src/main/release/src/NOTICE?rev=649731&r1=649730&r2=649731&view=diff
==============================================================================
--- incubator/tuscany/java/sca/distribution/src/main/release/src/NOTICE (original)
+++ incubator/tuscany/java/sca/distribution/src/main/release/src/NOTICE Fri Apr 18 17:23:34 2008
@@ -4,24 +4,36 @@
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-Unless otherwise indicated, all distribution made available by the Apache Software Foundation
-is provided to you under the terms and conditions of the Apache License Version 2.0 ("AL").
-A copy of the AL is provided with this distribution as the LICENSE file present in the
-root directory, and is also available at http://www.apache.org/licenses/.
+This product includes/uses JSON-RPC JavaScript client (jsonrpc.js)
+ Copyright (c) 2003-2004 Jan-Klaas Kollhof
+ Copyright (c) 2005 Michael Clark, Metaparadigm Pte Ltd
This product also includes software under the BSD license
(see the LICENSE file contained in this distribution), with
the following copyright:
+ Copyright (c) 2006, Sun Microsystems, Inc. All rights reserved.
- Copyright (c) 2006, Sun Microsystems, Inc.
- All rights reserved.
+This product includes software under the Service Component Architecture JavaDoc,
+Interface Definition files and XSD files license.
+ (c) Copyright SCA Collaboration 2006, 2007
-This product also includes software under the OSOA license
-(see the LICENSE file contained in this distribution), with
-the following copyright:
+This product includes software under the Service Data Objects JavaDoc and
+Interface Definition file license
+
+(c) Copyright BEA Systems, Inc., International Business Machines Corporation,
+Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG.,
+Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies,
+2005, 2006. All rights reserved.
+
+This product includes software under the W3C(c) Software License
+with the following copyright:
+
+Copyright (c) 2008 World Wide Web Consortium, (Massachusetts Institute of Technology,
+European Research Consortium for Informatics and Mathematics, Keio University).
+All Rights Reserved. This work is distributed under the W3C(c) Software License [1] in
+the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+[1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
- (c) Copyright BEA Systems, Inc., International Business Machines Corporation,
- Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG.,
- Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies,
- 2005, 2006. All rights reserved.
Modified: incubator/tuscany/java/sca/distribution/standalone/src/test/resources/repo/tuscany.properties
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/standalone/src/test/resources/repo/tuscany.properties?rev=649731&r1=649730&r2=649731&view=diff
==============================================================================
--- incubator/tuscany/java/sca/distribution/standalone/src/test/resources/repo/tuscany.properties (original)
+++ incubator/tuscany/java/sca/distribution/standalone/src/test/resources/repo/tuscany.properties Fri Apr 18 17:23:34 2008
@@ -1,3 +1,19 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
nodeName=http://localhost:8080/myNode/
#domainName=http://localhost:8777/tuscany/foo/
#startManager=true
Modified: incubator/tuscany/java/sca/distribution/tomcat/src/main/resources/sca-contributions/tuscany.properties
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/tomcat/src/main/resources/sca-contributions/tuscany.properties?rev=649731&r1=649730&r2=649731&view=diff
==============================================================================
--- incubator/tuscany/java/sca/distribution/tomcat/src/main/resources/sca-contributions/tuscany.properties (original)
+++ incubator/tuscany/java/sca/distribution/tomcat/src/main/resources/sca-contributions/tuscany.properties Fri Apr 18 17:23:34 2008
@@ -1,3 +1,19 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
#nodeName=http://localhost:8080/tuscany/
#domainName=http://localhost:8877
hotDeployInterval=10000
Modified: incubator/tuscany/java/sca/distribution/webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/webapp/pom.xml?rev=649731&r1=649730&r2=649731&view=diff
==============================================================================
--- incubator/tuscany/java/sca/distribution/webapp/pom.xml (original)
+++ incubator/tuscany/java/sca/distribution/webapp/pom.xml Fri Apr 18 17:23:34 2008
@@ -340,7 +340,7 @@
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.2</version>
+ <version>1.1.1</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
Modified: incubator/tuscany/java/sca/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/ContributionUploaderServlet.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/ContributionUploaderServlet.java?rev=649731&r1=649730&r2=649731&view=diff
==============================================================================
--- incubator/tuscany/java/sca/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/ContributionUploaderServlet.java (original)
+++ incubator/tuscany/java/sca/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/ContributionUploaderServlet.java Fri Apr 18 17:23:34 2008
@@ -1,116 +1,116 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tuscany.sca.webapp;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.FileItemFactory;
-import org.apache.commons.fileupload.FileUploadException;
-import org.apache.commons.fileupload.disk.DiskFileItemFactory;
-import org.apache.commons.fileupload.servlet.ServletFileUpload;
-
-import org.apache.tuscany.sca.host.webapp.HotUpdateContextListener;
-
-/**
- * A Servlet to upload a contribution file.
- */
-public class ContributionUploaderServlet extends HttpServlet {
-
- private static final long serialVersionUID = System.currentTimeMillis();
-
- private File repository;
-
- @Override
- public void init(ServletConfig config) throws ServletException {
- ServletContext servletContext = config.getServletContext();
- repository = new File(servletContext.getRealPath(HotUpdateContextListener.REPOSITORY_FOLDER_NAME));
- }
-
- @Override
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
- // Check that we have a file upload request
- boolean isMultipart = ServletFileUpload.isMultipartContent(request);
- if (!isMultipart) {
- throw new RuntimeException("Need multipart content");
- }
-
- // Create a factory for disk-based file items
- FileItemFactory factory = new DiskFileItemFactory();
-
- // Create a new file upload handler
- ServletFileUpload upload = new ServletFileUpload(factory);
-
- try {
- // Parse the request
- List /* FileItem */ items = upload.parseRequest(request);
- // Process the uploaded items
- Iterator iter = items.iterator();
- while (iter.hasNext()) {
- FileItem item = (FileItem) iter.next();
-
- if (!item.isFormField()) {
- String fileName = item.getName();
- int index = fileName.lastIndexOf("\\") + 1;
- String uploadedFileName = repository.getAbsolutePath() + "/" + fileName.substring(index);
- File uploadedFile = new File(uploadedFileName);
- item.write(uploadedFile);
- }
- }
- }
- catch(FileUploadException e) {
- throw new RuntimeException(e);
- }
- catch(Throwable e) {
- e.printStackTrace();
- throw new RuntimeException(e);
- }
-
- setResponse(response, request);
- }
-
- private void setResponse(HttpServletResponse response, HttpServletRequest request) throws IOException {
- response.setContentType("text/html");
- PrintWriter out = response.getWriter();
- out.println("<html>");
- out.println("<head>");
- out.println("<title>Apache Tuscany WebApp Runtime</title>");
- out.println("</head>");
- out.println("<body>");
- out.println("<h2>Composite file uploaded</h2>");
- int port = request.getServerPort();
- String portSubStr = ((port == -1) ? "" : (":" + request.getServerPort()));
- String backPath = request.getScheme() + "://" + request.getServerName() + portSubStr + request.getContextPath();
- out.println("Go <a href=\"" + backPath + "\">back</a>");
- out.println("</body>");
- out.println("</html>");
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.tuscany.sca.webapp;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.FileItemFactory;
+import org.apache.commons.fileupload.FileUploadException;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
+import org.apache.commons.fileupload.servlet.ServletFileUpload;
+
+import org.apache.tuscany.sca.host.webapp.HotUpdateContextListener;
+
+/**
+ * A Servlet to upload a contribution file.
+ */
+public class ContributionUploaderServlet extends HttpServlet {
+
+ private static final long serialVersionUID = System.currentTimeMillis();
+
+ private File repository;
+
+ @Override
+ public void init(ServletConfig config) throws ServletException {
+ ServletContext servletContext = config.getServletContext();
+ repository = new File(servletContext.getRealPath(HotUpdateContextListener.REPOSITORY_FOLDER_NAME));
+ }
+
+ @Override
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException {
+ // Check that we have a file upload request
+ boolean isMultipart = ServletFileUpload.isMultipartContent(request);
+ if (!isMultipart) {
+ throw new RuntimeException("Need multipart content");
+ }
+
+ // Create a factory for disk-based file items
+ FileItemFactory factory = new DiskFileItemFactory();
+
+ // Create a new file upload handler
+ ServletFileUpload upload = new ServletFileUpload(factory);
+
+ try {
+ // Parse the request
+ List /* FileItem */ items = upload.parseRequest(request);
+ // Process the uploaded items
+ Iterator iter = items.iterator();
+ while (iter.hasNext()) {
+ FileItem item = (FileItem) iter.next();
+
+ if (!item.isFormField()) {
+ String fileName = item.getName();
+ int index = fileName.lastIndexOf("\\") + 1;
+ String uploadedFileName = repository.getAbsolutePath() + "/" + fileName.substring(index);
+ File uploadedFile = new File(uploadedFileName);
+ item.write(uploadedFile);
+ }
+ }
+ }
+ catch(FileUploadException e) {
+ throw new RuntimeException(e);
+ }
+ catch(Throwable e) {
+ e.printStackTrace();
+ throw new RuntimeException(e);
+ }
+
+ setResponse(response, request);
+ }
+
+ private void setResponse(HttpServletResponse response, HttpServletRequest request) throws IOException {
+ response.setContentType("text/html");
+ PrintWriter out = response.getWriter();
+ out.println("<html>");
+ out.println("<head>");
+ out.println("<title>Apache Tuscany WebApp Runtime</title>");
+ out.println("</head>");
+ out.println("<body>");
+ out.println("<h2>Composite file uploaded</h2>");
+ int port = request.getServerPort();
+ String portSubStr = ((port == -1) ? "" : (":" + request.getServerPort()));
+ String backPath = request.getScheme() + "://" + request.getServerName() + portSubStr + request.getContextPath();
+ out.println("Go <a href=\"" + backPath + "\">back</a>");
+ out.println("</body>");
+ out.println("</html>");
+ }
+}
Propchange: incubator/tuscany/java/sca/distribution/webapp/src/main/java/org/apache/tuscany/sca/webapp/ContributionUploaderServlet.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/tuscany/java/sca/distribution/webapp/src/main/webapp/scaDomainInfo.jsp
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/distribution/webapp/src/main/webapp/scaDomainInfo.jsp?rev=649731&r1=649730&r2=649731&view=diff
==============================================================================
--- incubator/tuscany/java/sca/distribution/webapp/src/main/webapp/scaDomainInfo.jsp (original)
+++ incubator/tuscany/java/sca/distribution/webapp/src/main/webapp/scaDomainInfo.jsp Fri Apr 18 17:23:34 2008
@@ -1,74 +1,74 @@
-<%--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
---%>
-
-<%@ page import="org.apache.tuscany.sca.host.embedded.SCADomain"%>
-<%@ page import="org.apache.tuscany.sca.host.embedded.management.ComponentManager"%>
-<%@ page import="org.apache.tuscany.sca.assembly.ComponentService"%>
-<%@ page import="org.apache.tuscany.sca.assembly.Binding"%>
-
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%
- SCADomain scaDomain = (SCADomain) application.getAttribute("org.apache.tuscany.sca.SCADomain");
- ComponentManager componentManager = scaDomain.getComponentManager();
-%>
-<html>
-<head><title>Apache Tuscany WebApp Runtime</title></head>
-
-<body>
-Apache Tuscany WebApp Runtime
-<br>
-Components in SCA Domain:
- <%
- java.util.Iterator i = componentManager.getComponentNames().iterator();
- while (i.hasNext()) {
- String compName = i.next().toString();
-
- %><br><%=compName%><br><%
-
- org.apache.tuscany.sca.assembly.Component comp = componentManager.getComponent(compName);
- java.util.Iterator j = comp.getServices().iterator();
- while (j.hasNext()) {
- ComponentService compService = (ComponentService)j.next();
-
- %><%=" - Service: " + compService.getName()%><br><%
-
- java.util.Iterator k = compService.getBindings().iterator();
- while (k.hasNext()) {
- Binding b = (Binding)k.next();
- String bindingType = b.getClass().getName();
-
- %><%="-- Binding: " + b.getName() + "(" + bindingType.substring(bindingType.lastIndexOf('.')+1) + ") URI: " + b.getURI()%><br><%
- }
- }
- }
- %>
-<br>
-
-<hr>
-You can fill in a composite file to upload
-
-<form method='POST' enctype='multipart/form-data' action='/tuscany/ContributionUploader'>
-Composite file to upload: <input type=file name=upfile><br>
-<br>
-<input type=submit value=Press> to upload the composite file
-</form>
-
-</body>
-</html>
-
+<%--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+--%>
+
+<%@ page import="org.apache.tuscany.sca.host.embedded.SCADomain"%>
+<%@ page import="org.apache.tuscany.sca.host.embedded.management.ComponentManager"%>
+<%@ page import="org.apache.tuscany.sca.assembly.ComponentService"%>
+<%@ page import="org.apache.tuscany.sca.assembly.Binding"%>
+
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%
+ SCADomain scaDomain = (SCADomain) application.getAttribute("org.apache.tuscany.sca.SCADomain");
+ ComponentManager componentManager = scaDomain.getComponentManager();
+%>
+<html>
+<head><title>Apache Tuscany WebApp Runtime</title></head>
+
+<body>
+Apache Tuscany WebApp Runtime
+<br>
+Components in SCA Domain:
+ <%
+ java.util.Iterator i = componentManager.getComponentNames().iterator();
+ while (i.hasNext()) {
+ String compName = i.next().toString();
+
+ %><br><%=compName%><br><%
+
+ org.apache.tuscany.sca.assembly.Component comp = componentManager.getComponent(compName);
+ java.util.Iterator j = comp.getServices().iterator();
+ while (j.hasNext()) {
+ ComponentService compService = (ComponentService)j.next();
+
+ %><%=" - Service: " + compService.getName()%><br><%
+
+ java.util.Iterator k = compService.getBindings().iterator();
+ while (k.hasNext()) {
+ Binding b = (Binding)k.next();
+ String bindingType = b.getClass().getName();
+
+ %><%="-- Binding: " + b.getName() + "(" + bindingType.substring(bindingType.lastIndexOf('.')+1) + ") URI: " + b.getURI()%><br><%
+ }
+ }
+ }
+ %>
+<br>
+
+<hr>
+You can fill in a composite file to upload
+
+<form method='POST' enctype='multipart/form-data' action='/tuscany/ContributionUploader'>
+Composite file to upload: <input type=file name=upfile><br>
+<br>
+<input type=submit value=Press> to upload the composite file
+</form>
+
+</body>
+</html>
+
Propchange: incubator/tuscany/java/sca/distribution/webapp/src/main/webapp/scaDomainInfo.jsp
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org