You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by fm...@apache.org on 2010/09/20 14:53:55 UTC
svn commit: r998911 - in /tuscany/sandbox/samples: applications/
getting-started/ getting-started/contributions/
getting-started/helloworld-contribution/ getting-started/helloworld-webapp/
getting-started/webapps/ running-tuscany/ sca-extensions/ sca-e...
Author: fmoga
Date: Mon Sep 20 12:53:53 2010
New Revision: 998911
URL: http://svn.apache.org/viewvc?rev=998911&view=rev
Log:
Trimmed getting-started folder.
Added:
tuscany/sandbox/samples/getting-started/helloworld-contribution/
- copied from r998906, tuscany/sandbox/samples/getting-started/contributions/helloworld/
tuscany/sandbox/samples/getting-started/helloworld-webapp/ (props changed)
- copied from r998906, tuscany/sandbox/samples/getting-started/webapps/helloworld/
tuscany/sandbox/samples/sca-extensions/helloworld/ (props changed)
- copied from r998906, tuscany/sandbox/samples/getting-started/webapps/helloworld/
tuscany/sandbox/samples/sca-extensions/helloworld-bpel/ (props changed)
- copied from r998906, tuscany/sandbox/samples/getting-started/webapps/helloworld-bpel/
tuscany/sandbox/samples/sca-extensions/helloworld-bpel-contribution/
- copied from r998906, tuscany/sandbox/samples/getting-started/contributions/helloworld-bpel/
tuscany/sandbox/samples/sca-extensions/helloworld-bpel-webapp/ (props changed)
- copied from r998906, tuscany/sandbox/samples/getting-started/webapps/helloworld-bpel/
tuscany/sandbox/samples/sca-extensions/helloworld-jaxrs/ (props changed)
- copied from r998906, tuscany/sandbox/samples/getting-started/webapps/helloworld-jaxrs/
tuscany/sandbox/samples/sca-extensions/helloworld-jms/ (props changed)
- copied from r998906, tuscany/sandbox/samples/getting-started/webapps/helloworld-jms/
tuscany/sandbox/samples/sca-extensions/helloworld-js-client/ (props changed)
- copied from r998906, tuscany/sandbox/samples/getting-started/webapps/helloworld-js-client/
tuscany/sandbox/samples/sca-extensions/helloworld-jsf/ (props changed)
- copied from r998906, tuscany/sandbox/samples/getting-started/webapps/helloworld-jsf/
tuscany/sandbox/samples/sca-extensions/helloworld-jsp/ (props changed)
- copied from r998906, tuscany/sandbox/samples/getting-started/webapps/helloworld-jsp/
tuscany/sandbox/samples/sca-extensions/helloworld-recursive/ (props changed)
- copied from r998906, tuscany/sandbox/samples/getting-started/contributions/helloworld-recursive/
tuscany/sandbox/samples/sca-extensions/helloworld-recursive-ws/ (props changed)
- copied from r998906, tuscany/sandbox/samples/getting-started/contributions/helloworld-recursive-ws/
tuscany/sandbox/samples/sca-extensions/helloworld-scaclient/
- copied from r998906, tuscany/sandbox/samples/getting-started/contributions/helloworld-scaclient/
tuscany/sandbox/samples/sca-extensions/helloworld-servlet/ (props changed)
- copied from r998906, tuscany/sandbox/samples/getting-started/webapps/helloworld-servlet/
tuscany/sandbox/samples/sca-extensions/helloworld-spring/ (props changed)
- copied from r998906, tuscany/sandbox/samples/getting-started/webapps/helloworld-spring/
tuscany/sandbox/samples/sca-extensions/helloworld-spring-contribution/
- copied from r998906, tuscany/sandbox/samples/getting-started/contributions/helloworld-spring/
tuscany/sandbox/samples/sca-extensions/helloworld-spring-webapp/ (props changed)
- copied from r998906, tuscany/sandbox/samples/getting-started/webapps/helloworld-spring/
tuscany/sandbox/samples/sca-extensions/helloworld-stripes/ (props changed)
- copied from r998906, tuscany/sandbox/samples/getting-started/webapps/helloworld-stripes/
tuscany/sandbox/samples/sca-extensions/helloworld-ws-sdo/
- copied from r998906, tuscany/sandbox/samples/getting-started/contributions/helloworld-ws-sdo/
Removed:
tuscany/sandbox/samples/applications/pom.xml
tuscany/sandbox/samples/getting-started/contributions/
tuscany/sandbox/samples/getting-started/pom.xml
tuscany/sandbox/samples/getting-started/webapps/
tuscany/sandbox/samples/running-tuscany/pom.xml
tuscany/sandbox/samples/sca-extensions/helloworld-bpel/README
tuscany/sandbox/samples/sca-extensions/helloworld-bpel/pom.xml
tuscany/sandbox/samples/sca-extensions/helloworld-bpel/src/
tuscany/sandbox/samples/sca-extensions/helloworld-spring/pom.xml
tuscany/sandbox/samples/sca-extensions/helloworld-spring/src/
tuscany/sandbox/samples/sca-extensions/helloworld/README
tuscany/sandbox/samples/sca-extensions/helloworld/pom.xml
tuscany/sandbox/samples/sca-extensions/helloworld/src/
tuscany/sandbox/samples/sca-extensions/pom.xml
tuscany/sandbox/samples/sca-features/pom.xml
Modified:
tuscany/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/main/java/sample/HelloworldClientImpl.java
tuscany/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/main/resources/helloworld-client-context.xml
tuscany/sandbox/samples/sca-extensions/helloworld-spring-webapp/src/test/resources/test-web.xml
Propchange: tuscany/sandbox/samples/getting-started/helloworld-webapp/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep 20 12:53:53 2010
@@ -0,0 +1,20 @@
+target
+work
+dojo
+*.iws
+*.ipr
+*.iml
+derby.log
+maven.log
+maven-eclipse.xml
+build.xml
+build-dependency.xml
+velocity.log*
+junit*.properties
+surefire*.properties
+.project
+.classpath
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
Propchange: tuscany/sandbox/samples/getting-started/helloworld-webapp/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Sep 20 12:53:53 2010
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.3/samples/webapps/helloworld:671193
Propchange: tuscany/sandbox/samples/sca-extensions/helloworld/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: tuscany/sandbox/samples/sca-extensions/helloworld-bpel/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: tuscany/sandbox/samples/sca-extensions/helloworld-bpel-webapp/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep 20 12:53:53 2010
@@ -0,0 +1,20 @@
+target
+work
+dojo
+*.iws
+*.ipr
+*.iml
+derby.log
+maven.log
+maven-eclipse.xml
+build.xml
+build-dependency.xml
+velocity.log*
+junit*.properties
+surefire*.properties
+.project
+.classpath
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
Propchange: tuscany/sandbox/samples/sca-extensions/helloworld-bpel-webapp/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Sep 20 12:53:53 2010
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.3/samples/webapps/helloworld-bpel:671193
Propchange: tuscany/sandbox/samples/sca-extensions/helloworld-jaxrs/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep 20 12:53:53 2010
@@ -0,0 +1,20 @@
+target
+work
+dojo
+*.iws
+*.ipr
+*.iml
+derby.log
+maven.log
+maven-eclipse.xml
+build.xml
+build-dependency.xml
+velocity.log*
+junit*.properties
+surefire*.properties
+.project
+.classpath
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
Propchange: tuscany/sandbox/samples/sca-extensions/helloworld-jaxrs/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Sep 20 12:53:53 2010
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.3/samples/webapps/helloworld-jaxrs:671193
Propchange: tuscany/sandbox/samples/sca-extensions/helloworld-jms/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep 20 12:53:53 2010
@@ -0,0 +1,19 @@
+target
+work
+dojo
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+derby.log
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
+activemq-data
+maven-eclipse.xml
Propchange: tuscany/sandbox/samples/sca-extensions/helloworld-jms/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Sep 20 12:53:53 2010
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.3/samples/webapps/helloworld-jms:671193
Propchange: tuscany/sandbox/samples/sca-extensions/helloworld-js-client/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep 20 12:53:53 2010
@@ -0,0 +1,20 @@
+target
+work
+dojo
+*.iws
+*.ipr
+*.iml
+derby.log
+maven.log
+maven-eclipse.xml
+build.xml
+build-dependency.xml
+velocity.log*
+junit*.properties
+surefire*.properties
+.project
+.classpath
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
Propchange: tuscany/sandbox/samples/sca-extensions/helloworld-js-client/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Sep 20 12:53:53 2010
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.3/samples/webapps/helloworld-js-client:671193
Propchange: tuscany/sandbox/samples/sca-extensions/helloworld-jsf/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep 20 12:53:53 2010
@@ -0,0 +1,20 @@
+target
+work
+dojo
+*.iws
+*.ipr
+*.iml
+derby.log
+maven.log
+maven-eclipse.xml
+build.xml
+build-dependency.xml
+velocity.log*
+junit*.properties
+surefire*.properties
+.project
+.classpath
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
Propchange: tuscany/sandbox/samples/sca-extensions/helloworld-jsf/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Sep 20 12:53:53 2010
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.3/samples/webapps/helloworld-jsf:671193
Propchange: tuscany/sandbox/samples/sca-extensions/helloworld-jsp/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep 20 12:53:53 2010
@@ -0,0 +1,20 @@
+target
+work
+dojo
+*.iws
+*.ipr
+*.iml
+derby.log
+maven.log
+maven-eclipse.xml
+build.xml
+build-dependency.xml
+velocity.log*
+junit*.properties
+surefire*.properties
+.project
+.classpath
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
Propchange: tuscany/sandbox/samples/sca-extensions/helloworld-jsp/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Sep 20 12:53:53 2010
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.3/samples/webapps/helloworld-jsp:671193
Propchange: tuscany/sandbox/samples/sca-extensions/helloworld-recursive/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep 20 12:53:53 2010
@@ -0,0 +1,20 @@
+target
+work
+dojo
+*.iws
+*.ipr
+*.iml
+derby.log
+maven.log
+maven-eclipse.xml
+build.xml
+build-dependency.xml
+velocity.log*
+junit*.properties
+surefire*.properties
+.project
+.classpath
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
Propchange: tuscany/sandbox/samples/sca-extensions/helloworld-recursive/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Sep 20 12:53:53 2010
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.3/samples/getting-started/contributions/helloworld-recursive:671193
Propchange: tuscany/sandbox/samples/sca-extensions/helloworld-recursive-ws/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep 20 12:53:53 2010
@@ -0,0 +1,20 @@
+target
+work
+dojo
+*.iws
+*.ipr
+*.iml
+derby.log
+maven.log
+maven-eclipse.xml
+build.xml
+build-dependency.xml
+velocity.log*
+junit*.properties
+surefire*.properties
+.project
+.classpath
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
Propchange: tuscany/sandbox/samples/sca-extensions/helloworld-recursive-ws/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Sep 20 12:53:53 2010
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.3/samples/getting-started/contributions/helloworld-recursive-ws:671193
Propchange: tuscany/sandbox/samples/sca-extensions/helloworld-servlet/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep 20 12:53:53 2010
@@ -0,0 +1,20 @@
+target
+work
+dojo
+*.iws
+*.ipr
+*.iml
+derby.log
+maven.log
+maven-eclipse.xml
+build.xml
+build-dependency.xml
+velocity.log*
+junit*.properties
+surefire*.properties
+.project
+.classpath
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
Propchange: tuscany/sandbox/samples/sca-extensions/helloworld-servlet/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Sep 20 12:53:53 2010
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.3/samples/webapps/helloworld-servlet:671193
Propchange: tuscany/sandbox/samples/sca-extensions/helloworld-spring/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: tuscany/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/main/java/sample/HelloworldClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/main/java/sample/HelloworldClientImpl.java?rev=998911&r1=998906&r2=998911&view=diff
==============================================================================
--- tuscany/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/main/java/sample/HelloworldClientImpl.java (original)
+++ tuscany/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/main/java/sample/HelloworldClientImpl.java Mon Sep 20 12:53:53 2010
@@ -1,48 +1,48 @@
-/*
- * 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 sample;
-
-import org.oasisopen.sca.annotation.Reference;
-
-public class HelloworldClientImpl implements Helloworld {
- private Helloworld helloworld;
-
- // SCA reference
- @Reference(required = false)
- private DateService dateService;
-
- public HelloworldClientImpl() {
- System.out.println("HelloworldClientImpl()");
- }
-
- public String sayHello(String name) {
- System.out.println("HelloworldClientImpl.sayHello(" + name + ")");
- if (dateService == null) {
- return "Hello " + name;
- }
- return "[" + dateService.getDate() + "] " + helloworld.sayHello(name);
- }
-
- // Setter for spring injection
- public void setHelloworld(Helloworld helloworld) {
- System.out.println("Injected with " + helloworld);
- this.helloworld = helloworld;
- }
-
-}
+/*
+ * 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 sample;
+
+import org.oasisopen.sca.annotation.Reference;
+
+public class HelloworldClientImpl implements Helloworld {
+ private Helloworld helloworld;
+
+ // SCA reference
+ @Reference(required = false)
+ private DateService dateService;
+
+ public HelloworldClientImpl() {
+ System.out.println("HelloworldClientImpl()");
+ }
+
+ public String sayHello(String name) {
+ System.out.println("HelloworldClientImpl.sayHello(" + name + ")");
+ if (dateService == null) {
+ return "Hello " + name;
+ }
+ return "[" + dateService.getDate() + "] " + helloworld.sayHello(name);
+ }
+
+ // Setter for spring injection
+ public void setHelloworld(Helloworld helloworld) {
+ System.out.println("Injected with " + helloworld);
+ this.helloworld = helloworld;
+ }
+
+}
Modified: tuscany/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/main/resources/helloworld-client-context.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/main/resources/helloworld-client-context.xml?rev=998911&r1=998906&r2=998911&view=diff
==============================================================================
--- tuscany/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/main/resources/helloworld-client-context.xml (original)
+++ tuscany/sandbox/samples/sca-extensions/helloworld-spring-contribution/src/main/resources/helloworld-client-context.xml Mon Sep 20 12:53:53 2010
@@ -1,37 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:sca="http://www.springframework.org/schema/sca"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
-
- <bean id="HelloworldClientBean" class="sample.HelloworldClientImpl">
- <property name="helloworld">
- <ref bean="HelloworldBean"/>
- </property>
- </bean>
-
- <!--
- <sca:reference name="dateService" type="sample.DateService"/>
- -->
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:sca="http://www.springframework.org/schema/sca"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
+
+ <bean id="HelloworldClientBean" class="sample.HelloworldClientImpl">
+ <property name="helloworld">
+ <ref bean="HelloworldBean"/>
+ </property>
+ </bean>
+
+ <!--
+ <sca:reference name="dateService" type="sample.DateService"/>
+ -->
+
</beans>
\ No newline at end of file
Propchange: tuscany/sandbox/samples/sca-extensions/helloworld-spring-webapp/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep 20 12:53:53 2010
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Propchange: tuscany/sandbox/samples/sca-extensions/helloworld-spring-webapp/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Sep 20 12:53:53 2010
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.3/samples/webapps/helloworld-spring:671193
Modified: tuscany/sandbox/samples/sca-extensions/helloworld-spring-webapp/src/test/resources/test-web.xml
URL: http://svn.apache.org/viewvc/tuscany/sandbox/samples/sca-extensions/helloworld-spring-webapp/src/test/resources/test-web.xml?rev=998911&r1=998906&r2=998911&view=diff
==============================================================================
--- tuscany/sandbox/samples/sca-extensions/helloworld-spring-webapp/src/test/resources/test-web.xml (original)
+++ tuscany/sandbox/samples/sca-extensions/helloworld-spring-webapp/src/test/resources/test-web.xml Mon Sep 20 12:53:53 2010
@@ -1,25 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.
--->
-<web-app version="2.4"
- xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" >
-
-</web-app>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<web-app version="2.4"
+ xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" >
+
+</web-app>
Propchange: tuscany/sandbox/samples/sca-extensions/helloworld-stripes/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Sep 20 12:53:53 2010
@@ -0,0 +1,20 @@
+target
+work
+dojo
+*.iws
+*.ipr
+*.iml
+derby.log
+maven.log
+maven-eclipse.xml
+build.xml
+build-dependency.xml
+velocity.log*
+junit*.properties
+surefire*.properties
+.project
+.classpath
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
Propchange: tuscany/sandbox/samples/sca-extensions/helloworld-stripes/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Sep 20 12:53:53 2010
@@ -0,0 +1 @@
+/tuscany/branches/sca-java-1.3/samples/webapps/helloworld-stripes:671193