Updates to source assembly to fix issues reported by RAT report

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@898236 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 196 insertions, 197 deletions

diff --git a/sca-java-1.x/branches/sca-java-1.6/distribution/src/main/assembly/src.xml b/sca-java-1.x/branches/sca-java-1.6/distribution/src/main/assembly/src.xml
index 933af5652e..decb7726fc 100644
--- a/sca-java-1.x/branches/sca-java-1.6/distribution/src/main/assembly/src.xml
+++ b/sca-java-1.x/branches/sca-java-1.6/distribution/src/main/assembly/src.xml
@@ -18,202 +18,201 @@
  * under the License.
 -->
 <assembly>
-    <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
-    <id>src</id>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <formats>
-        <format>tar.gz</format>
-	<format>zip</format>
-    </formats>
+	<!--
+		id typically identifies the "type" (src vs bin etc) of the assembly
+	-->
+	<id>src</id>
+	<includeBaseDirectory>false</includeBaseDirectory>
+	<formats>
+		<format>tar.gz</format>
+		<format>zip</format>
+	</formats>
 
-    <fileSets>
-	 <fileSet>
-             <directory>src/main/release</directory>
-	     <outputDirectory>tuscany-sca-${tuscany.version}-src</outputDirectory>
-	     <includes>
-             <include>CHANGES</include>
-             <include>README</include>
-             <include>RELEASE_NOTES</include>
-             </includes>
-	 </fileSet>
-	 <fileSet>
-             <directory>src/main/release/src</directory>
-	     <outputDirectory>tuscany-sca-${tuscany.version}-src</outputDirectory>
-	     <includes>
-		 <include>BUILDING</include>
-		 <include>LICENSE</include>
-		 <include>NOTICE</include>
-             </includes>
-	 </fileSet>
-         <fileSet>
-             <directory>target/maven-shared-archive-resources/META-INF</directory>
-             <outputDirectory>tuscany-sca-${tuscany.version}-src</outputDirectory>
-             <includes>
-                 <include>NOTICE</include>
-             </includes>
-         </fileSet>
-	 <fileSet>
-	     <directory>..</directory>
-	     <outputDirectory>tuscany-sca-${tuscany.version}-src</outputDirectory>
-	     <includes>
-	         <include>**/*</include>
-             </includes>
-             <excludes>
-    		<exclude>contrib</exclude>
-    		<exclude>contrib/**/*</exclude>
-    		<exclude>doc</exclude>
-    		<exclude>doc/**/*</exclude>
-                <exclude>**/target</exclude>
-    		<exclude>**/target/**/*</exclude>
-    		<exclude>**/build</exclude>
-    		<exclude>**/build/**/*</exclude>
-    		<exclude>**/.settings</exclude>
-    		<exclude>**/.settings/**/*</exclude>
-    		<exclude>**/.classpath</exclude>
-    		<exclude>**/.project</exclude>
-    		<exclude>**/.wtpmodules</exclude>
-    		<exclude>**/surefire*</exclude>
-    		<exclude>**/cobertura.ser</exclude>
-    		<exclude>**/log/*.dat</exclude>
-    		<exclude>**/orbtrc.*.txt</exclude>
-    		<exclude>bin</exclude>
-    		<exclude>bin/*</exclude>
-    		<exclude>**/var/journal</exclude>
-    		<exclude>**/build.out*</exclude>
-    		<exclude>velocity.log</exclude>
-    		<exclude>derby.log</exclude>
-    		<exclude>distribution/target-last-successful</exclude>
-    		<exclude>distribution/target-last-successful/**/*</exclude>
-    		<exclude>itest/velocity.log</exclude>
-                <exclude>itest/atom/work</exclude>
-                <exclude>itest/atom/work/**/*</exclude>
-                <exclude>itest/bpel/helloworld-ws/work</exclude>
-                <exclude>itest/bpel/helloworld-ws/work/**/*</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/domain/work</exclude>
-                <exclude>itest/domain/work/**/*</exclude>
-                <exclude>itest/exceptions-simple-ws/work</exclude>
-                <exclude>itest/exceptions-simple-ws/work/**/*</exclude>
-                <exclude>itest/late-reference-resolution/work</exclude>
-                <exclude>itest/late-reference-resolution/work/**/*</exclude>
-                <exclude>itest/policy/work</exclude>
-                <exclude>itest/policy/work/**/*</exclude>
-                <exclude>itest/policy-security-basicauth/work</exclude>
-                <exclude>itest/policy-security-basicauth/work/**/*</exclude>
-                <exclude>itest/spring/work</exclude>
-                <exclude>itest/spring/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>vtest/assembly/component/work</exclude>
-                <exclude>vtest/assembly/component/work/**/*</exclude>
-                <exclude>vtest/wsbinding/nowsdl/defaultbinding/work</exclude>
-                <exclude>vtest/wsbinding/nowsdl/defaultbinding/work/**/*</exclude>
-                <exclude>vtest/wsbinding/nowsdl/multisoapbindings/work</exclude>
-                <exclude>vtest/wsbinding/nowsdl/multisoapbindings/work/**/*</exclude>
-                <exclude>vtest/wsbinding/nowsdl/promoted/work</exclude>
-                <exclude>vtest/wsbinding/nowsdl/promoted/work/**/*</exclude>
-                <exclude>vtest/wsbinding/nowsdl/soapversion/work</exclude>
-                <exclude>vtest/wsbinding/nowsdl/soapversion/work/**/*</exclude>
-                <exclude>vtest/wsbinding/wsdlelement/binding/work</exclude>
-                <exclude>vtest/wsbinding/wsdlelement/binding/work/**/*</exclude>
-                <exclude>vtest/wsbinding/wsdlelement/port/work</exclude>
-                <exclude>vtest/wsbinding/wsdlelement/port/work/**/*</exclude>
-                <exclude>vtest/wsbinding/wsdlelement/service/work</exclude>
-                <exclude>vtest/wsbinding/wsdlelement/service/work/**/*</exclude>
-                <exclude>vtest/wsbinding/service/work</exclude>
-                <exclude>vtest/wsbinding/service/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>
-                <exclude>modules/node-impl/work/**/*</exclude>
-                <exclude>modules/implementation-bpel-ode/derby.log</exclude>
-                <exclude>modules/implementation-das</exclude>
-                <exclude>modules/implementation-das/**/*</exclude>
-                <exclude>modules/implementation-data</exclude>
-                <exclude>modules/implementation-data/**/*</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>modules/web-javascript-dojo/src/main/resources/dojo</exclude>
-                <exclude>modules/web-javascript-dojo/src/main/resources/dojo/**/*</exclude>
-                <exclude>samples/old</exclude>
-                <exclude>samples/old/**/*</exclude>
-                <exclude>samples/calculator-distributed/work</exclude>
-                <exclude>samples/calculator-distributed/work/**/*</exclude>
-                <exclude>samples/callback-ws-client/work</exclude>
-                <exclude>samples/callback-ws-client/work/**/*</exclude>
-                <exclude>samples/callback-ws-service/work</exclude>
-                <exclude>samples/callback-ws-service/work/**/*</exclude>
-                <exclude>samples/domain-webapp</exclude>
-                <exclude>samples/domain-webapp/**/*</exclude>
-                <exclude>samples/helloworld-jsonrpc-webapp/src/main/webapp/dojo</exclude>
-                <exclude>samples/helloworld-jsonrpc-webapp/src/main/webapp/dojo/**/*</exclude>
-                <exclude>samples/helloworld-dojo-webapp/src/main/webapp/dojo</exclude>
-                <exclude>samples/helloworld-dojo-webapp/src/main/webapp/dojo/**/*</exclude>
-                <exclude>samples/customer-dojo-webapp/src/main/webapp/dojo</exclude>
-                <exclude>samples/customer-dojo-webapp/src/main/webapp/dojo/**/*</exclude>
-                <exclude>samples/helloworld-ws-deep-webapp</exclude>
-                <exclude>samples/helloworld-ws-deep-webapp/**/*</exclude>
-                <exclude>samples/helloworld-ws-deep-webapp/work</exclude>
-                <exclude>samples/helloworld-ws-deep-webapp/work/**/*</exclude>
-                <exclude>samples/helloworld-ws-reference/work</exclude>
-                <exclude>samples/helloworld-ws-reference/work/**/*</exclude>
-                <exclude>samples/helloworld-ws-reference-jms/activemq-data</exclude>
-                <exclude>samples/helloworld-ws-reference-jms/activemq-data/**/*</exclude>
-                <exclude>samples/helloworld-ws-reference-secure/work</exclude>
-                <exclude>samples/helloworld-ws-reference-secure/work/**/*</exclude>
-                <exclude>samples/helloworld-ws-sdo/work</exclude>
-                <exclude>samples/helloworld-ws-sdo/work/**/*</exclude>
-                <exclude>samples/helloworld-ws-service/work</exclude>
-                <exclude>samples/helloworld-ws-service/work/**/*</exclude>
-                <exclude>samples/helloworld-ws-service-jms/activemq-data</exclude>
-                <exclude>samples/helloworld-ws-service-jms/activemq-data/**/*</exclude>
-                <exclude>samples/helloworld-ws-service-secure/work</exclude>
-                <exclude>samples/helloworld-ws-service-secure/work/**/*</exclude>
-                <exclude>samples/helloworld-ws-service-webapp</exclude>
-                <exclude>samples/helloworld-ws-service-webapp/**/*</exclude>
-                <exclude>samples/osgi-supplychain/.felix</exclude>
-                <exclude>samples/osgi-supplychain/.felix/**/*</exclude>
-                <exclude>samples/spi-implementation-pojo</exclude>
-                <exclude>samples/spi-implementation-pojo/**/*</exclude>
-                <exclude>samples/simple-callback-ws/work</exclude>
-                <exclude>samples/simple-callback-ws/work/**/*</exclude>
-                <exclude>samples/simple-bigbank-spring/src/main/resources/web/dojo</exclude> 
-                <exclude>samples/simple-bigbank-spring/src/main/resources/web/dojo/**/*</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>
-                <exclude>*/**/*.checkstyle</exclude>
-                <exclude>*/**/_/SESSIONS.ser</exclude>
-             </excludes>
-	 </fileSet>
-     </fileSets>
+	<fileSets>
+		<fileSet>
+			<directory>src/main/release</directory>
+			<outputDirectory>tuscany-sca-${tuscany.version}-src</outputDirectory>
+			<includes>
+				<include>CHANGES</include>
+				<include>README</include>
+				<include>RELEASE_NOTES</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>src/main/release/src</directory>
+			<outputDirectory>tuscany-sca-${tuscany.version}-src</outputDirectory>
+			<includes>
+				<include>BUILDING</include>
+				<include>LICENSE</include>
+				<include>NOTICE</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>target/maven-shared-archive-resources/META-INF</directory>
+			<outputDirectory>tuscany-sca-${tuscany.version}-src</outputDirectory>
+			<includes>
+				<include>NOTICE</include>
+			</includes>
+		</fileSet>
+		<fileSet>
+			<directory>..</directory>
+			<outputDirectory>tuscany-sca-${tuscany.version}-src</outputDirectory>
+			<includes>
+				<include>**/*</include>
+			</includes>
+			<excludes>
+				<exclude>contrib</exclude>
+				<exclude>contrib/**/*</exclude>
+				<exclude>doc</exclude>
+				<exclude>doc/**/*</exclude>
+				<exclude>**/target</exclude>
+				<exclude>**/target/**/*</exclude>
+				<exclude>**/build</exclude>
+				<exclude>**/build/**/*</exclude>
+				<exclude>**/.settings</exclude>
+				<exclude>**/.settings/**/*</exclude>
+				<exclude>**/.classpath</exclude>
+				<exclude>**/.project</exclude>
+				<exclude>**/.wtpmodules</exclude>
+				<exclude>**/maven-eclipse.xml</exclude>
+				<exclude>**/surefire*</exclude>
+				<exclude>**/cobertura.ser</exclude>
+				<exclude>**/log/*.dat</exclude>
+				<exclude>**/orbtrc.*.txt</exclude>
+				<exclude>bin</exclude>
+				<exclude>bin/*</exclude>
+				<exclude>**/var/journal</exclude>
+				<exclude>**/build.out*</exclude>
+				<exclude>**/resources/dojo</exclude>
+				<exclude>**/resources/dojo/**/*</exclude>
+				<exclude>**/webapp/dojo</exclude>
+				<exclude>**/webapp/dojo/**/*</exclude>
+				<exclude>velocity.log</exclude>
+				<exclude>derby.log</exclude>
+				<exclude>distribution/target-last-successful</exclude>
+				<exclude>distribution/target-last-successful/**/*</exclude>
+				<exclude>itest/velocity.log</exclude>
+				<exclude>itest/atom/work</exclude>
+				<exclude>itest/atom/work/**/*</exclude>
+				<exclude>itest/bpel/helloworld-ws/work</exclude>
+				<exclude>itest/bpel/helloworld-ws/work/**/*</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/domain/work</exclude>
+				<exclude>itest/domain/work/**/*</exclude>
+				<exclude>itest/exceptions-simple-ws/work</exclude>
+				<exclude>itest/exceptions-simple-ws/work/**/*</exclude>
+				<exclude>itest/late-reference-resolution/work</exclude>
+				<exclude>itest/late-reference-resolution/work/**/*</exclude>
+				<exclude>itest/policy/work</exclude>
+				<exclude>itest/policy/work/**/*</exclude>
+				<exclude>itest/policy-security-basicauth/work</exclude>
+				<exclude>itest/policy-security-basicauth/work/**/*</exclude>
+				<exclude>itest/spring/work</exclude>
+				<exclude>itest/spring/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>vtest/assembly/component/work</exclude>
+				<exclude>vtest/assembly/component/work/**/*</exclude>
+				<exclude>vtest/wsbinding/nowsdl/defaultbinding/work</exclude>
+				<exclude>vtest/wsbinding/nowsdl/defaultbinding/work/**/*</exclude>
+				<exclude>vtest/wsbinding/nowsdl/multisoapbindings/work</exclude>
+				<exclude>vtest/wsbinding/nowsdl/multisoapbindings/work/**/*</exclude>
+				<exclude>vtest/wsbinding/nowsdl/promoted/work</exclude>
+				<exclude>vtest/wsbinding/nowsdl/promoted/work/**/*</exclude>
+				<exclude>vtest/wsbinding/nowsdl/soapversion/work</exclude>
+				<exclude>vtest/wsbinding/nowsdl/soapversion/work/**/*</exclude>
+				<exclude>vtest/wsbinding/wsdlelement/binding/work</exclude>
+				<exclude>vtest/wsbinding/wsdlelement/binding/work/**/*</exclude>
+				<exclude>vtest/wsbinding/wsdlelement/port/work</exclude>
+				<exclude>vtest/wsbinding/wsdlelement/port/work/**/*</exclude>
+				<exclude>vtest/wsbinding/wsdlelement/service/work</exclude>
+				<exclude>vtest/wsbinding/wsdlelement/service/work/**/*</exclude>
+				<exclude>vtest/wsbinding/service/work</exclude>
+				<exclude>vtest/wsbinding/service/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>
+				<exclude>modules/node-impl/work/**/*</exclude>
+				<exclude>modules/implementation-bpel-ode/derby.log</exclude>
+				<exclude>modules/implementation-das</exclude>
+				<exclude>modules/implementation-das/**/*</exclude>
+				<exclude>modules/implementation-data</exclude>
+				<exclude>modules/implementation-data/**/*</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>
+				<exclude>samples/calculator-distributed/work/**/*</exclude>
+				<exclude>samples/callback-ws-client/work</exclude>
+				<exclude>samples/callback-ws-client/work/**/*</exclude>
+				<exclude>samples/callback-ws-service/work</exclude>
+				<exclude>samples/callback-ws-service/work/**/*</exclude>
+				<exclude>samples/domain-webapp</exclude>
+				<exclude>samples/domain-webapp/**/*</exclude>
+				<exclude>samples/helloworld-ws-deep-webapp</exclude>
+				<exclude>samples/helloworld-ws-deep-webapp/**/*</exclude>
+				<exclude>samples/helloworld-ws-deep-webapp/work</exclude>
+				<exclude>samples/helloworld-ws-deep-webapp/work/**/*</exclude>
+				<exclude>samples/helloworld-ws-reference/work</exclude>
+				<exclude>samples/helloworld-ws-reference/work/**/*</exclude>
+				<exclude>samples/helloworld-ws-reference-jms/activemq-data</exclude>
+				<exclude>samples/helloworld-ws-reference-jms/activemq-data/**/*</exclude>
+				<exclude>samples/helloworld-ws-reference-secure/work</exclude>
+				<exclude>samples/helloworld-ws-reference-secure/work/**/*</exclude>
+				<exclude>samples/helloworld-ws-sdo/work</exclude>
+				<exclude>samples/helloworld-ws-sdo/work/**/*</exclude>
+				<exclude>samples/helloworld-ws-service/work</exclude>
+				<exclude>samples/helloworld-ws-service/work/**/*</exclude>
+				<exclude>samples/helloworld-ws-service-jms/activemq-data</exclude>
+				<exclude>samples/helloworld-ws-service-jms/activemq-data/**/*</exclude>
+				<exclude>samples/helloworld-ws-service-secure/work</exclude>
+				<exclude>samples/helloworld-ws-service-secure/work/**/*</exclude>
+				<exclude>samples/helloworld-ws-service-webapp</exclude>
+				<exclude>samples/helloworld-ws-service-webapp/**/*</exclude>
+				<exclude>samples/osgi-supplychain/.felix</exclude>
+				<exclude>samples/osgi-supplychain/.felix/**/*</exclude>
+				<exclude>samples/spi-implementation-pojo</exclude>
+				<exclude>samples/spi-implementation-pojo/**/*</exclude>
+				<exclude>samples/simple-callback-ws/work</exclude>
+				<exclude>samples/simple-callback-ws/work/**/*</exclude>
+				<exclude>samples/simple-bigbank-spring/src/main/resources/web/dojo</exclude>
+				<exclude>samples/simple-bigbank-spring/src/main/resources/web/dojo/**/*</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>
+				<exclude>*/**/*.checkstyle</exclude>
+				<exclude>*/**/_/SESSIONS.ser</exclude>
+			</excludes>
+		</fileSet>
+	</fileSets>
 </assembly>