tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From antel...@apache.org
Subject svn commit: r501013 - in /incubator/tuscany/java/sca/extensions/spring/samples: client/ client/src/main/webapp/META-INF/sca/ client/src/main/webapp/WEB-INF/ server/src/main/webapp/WEB-INF/ server/src/main/webapp/WEB-INF/classes/
Date Mon, 29 Jan 2007 11:35:44 GMT
Author: antelder
Date: Mon Jan 29 03:35:36 2007
New Revision: 501013

URL: http://svn.apache.org/viewvc?view=rev&rev=501013
Log:
Get the Spring samples to at least startup successfully

Added:
    incubator/tuscany/java/sca/extensions/spring/samples/client/src/main/webapp/WEB-INF/default.scdl
      - copied, changed from r500786, incubator/tuscany/java/sca/extensions/spring/samples/client/src/main/webapp/META-INF/sca/default.scdl
    incubator/tuscany/java/sca/extensions/spring/samples/server/src/main/webapp/WEB-INF/application-context.xml
      - copied unchanged from r500786, incubator/tuscany/java/sca/extensions/spring/samples/server/src/main/webapp/WEB-INF/classes/application-context.xml
Removed:
    incubator/tuscany/java/sca/extensions/spring/samples/client/src/main/webapp/META-INF/sca/default.scdl
    incubator/tuscany/java/sca/extensions/spring/samples/server/src/main/webapp/WEB-INF/classes/application-context.xml
Modified:
    incubator/tuscany/java/sca/extensions/spring/samples/client/   (props changed)
    incubator/tuscany/java/sca/extensions/spring/samples/client/pom.xml
    incubator/tuscany/java/sca/extensions/spring/samples/client/src/main/webapp/WEB-INF/web.xml
    incubator/tuscany/java/sca/extensions/spring/samples/server/src/main/webapp/WEB-INF/default.scdl
    incubator/tuscany/java/sca/extensions/spring/samples/server/src/main/webapp/WEB-INF/web.xml

Propchange: incubator/tuscany/java/sca/extensions/spring/samples/client/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jan 29 03:35:36 2007
@@ -0,0 +1 @@
+..\..\etc\svn-ignores

Modified: incubator/tuscany/java/sca/extensions/spring/samples/client/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/spring/samples/client/pom.xml?view=diff&rev=501013&r1=501012&r2=501013
==============================================================================
--- incubator/tuscany/java/sca/extensions/spring/samples/client/pom.xml (original)
+++ incubator/tuscany/java/sca/extensions/spring/samples/client/pom.xml Mon Jan 29 03:35:36
2007
@@ -19,8 +19,8 @@
 -->
 <project>
     <parent>
-        <groupId>org.apache.tuscany.samples.sca.spring</groupId>
-        <artifactId>tuscany-samples-sca-spring</artifactId>
+        <groupId>org.apache.tuscany.sca.extensions.spring.samples</groupId>
+        <artifactId>parent</artifactId>
         <version>1.0-incubator-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -31,36 +31,18 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.osoa</groupId>
-            <artifactId>sca-api-r0.95</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca.kernel</groupId>
-            <artifactId>core</artifactId>
-            <version>0.1-pre-spec-SNAPSHOT</version>
-            <scope>runtime</scope>
-            <!-- runtime is need for webapp integration to include jar -->
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.4</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
-            <artifactId>webapp-api</artifactId>
-            <version>${pom.version}</version>
+            <!-- Spring-SCA container extension -->
+            <groupId>org.apache.tuscany.sca.extensions.spring</groupId>
+            <artifactId>tuscany-spring</artifactId>
+            <version>${extensionVersion}</version>
             <scope>runtime</scope>
-            <!-- runtime is need for webapp integration to include jar -->
         </dependency>
         <dependency>
-            <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
-            <artifactId>webapp-host</artifactId>
-            <version>${pom.version}</version>
+            <!-- Test binding extension -->
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>test</artifactId>
+            <version>0.1-pre-spec-SNAPSHOT</version>
             <scope>runtime</scope>
-            <!-- runtime is need for webapp integration to include jar -->
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -75,26 +57,14 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-	 <build>
-       <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-				<resource>
-                <directory>${notice.dir}</directory>
-                <targetPath>META-INF</targetPath>
-                <filtering>true</filtering>
-                <includes>
-                    <include>LICENSE.txt</include>
-                    <include>NOTICE.txt</include>
-                </includes>
-            </resource>
-        </resources>
-		  <plugins>
+
+    <build>
+        <finalName>client</finalName>
+        <plugins>
             <plugin>
                 <groupId>org.apache.tuscany.sca.runtime.webapp</groupId>
                 <artifactId>tuscany-war-plugin</artifactId>
+                <version>${scaKernelVersion}</version>
                 <executions>
                     <execution>
                         <id>tuscany-war</id>
@@ -104,26 +74,17 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <loadExtensionDependencies>false</loadExtensionDependencies>
-						<extensions>
-<!--                    <dependency>
-								<groupId>org.apache.tuscany.sca.services.databinding</groupId>
-                        <artifactId>databinding-sdo</artifactId>
-                        <version>${tuscanyVersion}</version>
-                     </dependency>-->
-							<dependency>
-								<groupId>org.apache.tuscany.sca.services.containers</groupId>
-								<artifactId>spring</artifactId>
-								<version>${tuscanyVersion}</version>
-							</dependency>
-							<dependency>
-								<groupId>org.apache.tuscany.sca</groupId>
-								<artifactId>test</artifactId>
-								<version>${tuscanyVersion}</version>
-							</dependency>
-						</extensions>
+                    <loadExtensionDependencies>true</loadExtensionDependencies>
+                    <extensions>
+                        <dependency>
+                            <groupId>org.apache.tuscany.sca.extensions.spring</groupId>
+                            <artifactId>tuscany-spring</artifactId>
+                            <version>${extensionVersion}</version>
+                        </dependency>
+                    </extensions>
                 </configuration>
             </plugin>
         </plugins>
-	</build>
+    </build>
+
 </project>

Copied: incubator/tuscany/java/sca/extensions/spring/samples/client/src/main/webapp/WEB-INF/default.scdl
(from r500786, incubator/tuscany/java/sca/extensions/spring/samples/client/src/main/webapp/META-INF/sca/default.scdl)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/spring/samples/client/src/main/webapp/WEB-INF/default.scdl?view=diff&rev=501013&p1=incubator/tuscany/java/sca/extensions/spring/samples/client/src/main/webapp/META-INF/sca/default.scdl&r1=500786&p2=incubator/tuscany/java/sca/extensions/spring/samples/client/src/main/webapp/WEB-INF/default.scdl&r2=501013
==============================================================================
--- incubator/tuscany/java/sca/extensions/spring/samples/client/src/main/webapp/META-INF/sca/default.scdl
(original)
+++ incubator/tuscany/java/sca/extensions/spring/samples/client/src/main/webapp/WEB-INF/default.scdl
Mon Jan 29 03:35:36 2007
@@ -1,39 +1,41 @@
-<?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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" name="SpringSample">
-    <component name="SpringSample">
-        <implementation.spring location="/WEB-INF/applicationContext.xml">
-            <reference name="testReference">
-                <interface.java interface="sample.TestComponent"/>
-                <binding.socket host="localhost" port="8888"/>
-            </reference>
-        </implementation.spring>
-    </component>
-
-    <!--component name="ScaComponent">
-        <implementation.spring location="application-context.xml">
-            <service name="testService">
-                <interface.java interface="sample.TestComponent"/>
-                <binding.test/>
-                <reference>testComponent</reference>
-            </service>
-        </implementation.spring>
-    </component-->
-</composite>
+<?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.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" name="SpringSample">
+    <component name="SpringSample">
+        <implementation.spring location="/WEB-INF/applicationContext.xml">
+<!--
+            <reference name="testReference">
+                <interface.java interface="sample.TestComponent"/>
+                <binding.socket host="localhost" port="8888"/>
+            </reference>
+-->
+        </implementation.spring>
+    </component>
+
+    <!--component name="ScaComponent">
+        <implementation.spring location="application-context.xml">
+            <service name="testService">
+                <interface.java interface="sample.TestComponent"/>
+                <binding.test/>
+                <reference>testComponent</reference>
+            </service>
+        </implementation.spring>
+    </component-->
+</composite>

Modified: incubator/tuscany/java/sca/extensions/spring/samples/client/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/spring/samples/client/src/main/webapp/WEB-INF/web.xml?view=diff&rev=501013&r1=501012&r2=501013
==============================================================================
--- incubator/tuscany/java/sca/extensions/spring/samples/client/src/main/webapp/WEB-INF/web.xml
(original)
+++ incubator/tuscany/java/sca/extensions/spring/samples/client/src/main/webapp/WEB-INF/web.xml
Mon Jan 29 03:35:36 2007
@@ -24,13 +24,8 @@
     <display-name>Tuscany Spring Sample</display-name>
 
     <context-param>
-        <param-name>tuscany.systemScdlPath</param-name>
-        <param-value>/META-INF/tuscany/webapp.scdl</param-value>
-    </context-param>
-
-    <context-param>
-        <param-name>tuscany.applicationScdlPath</param-name>
-        <param-value>/META-INF/sca/default.scdl</param-value>
+       <param-name>tuscany.online</param-name>
+       <param-value>false</param-value>
     </context-param>
 
     <context-param>

Modified: incubator/tuscany/java/sca/extensions/spring/samples/server/src/main/webapp/WEB-INF/default.scdl
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/spring/samples/server/src/main/webapp/WEB-INF/default.scdl?view=diff&rev=501013&r1=501012&r2=501013
==============================================================================
--- incubator/tuscany/java/sca/extensions/spring/samples/server/src/main/webapp/WEB-INF/default.scdl
(original)
+++ incubator/tuscany/java/sca/extensions/spring/samples/server/src/main/webapp/WEB-INF/default.scdl
Mon Jan 29 03:35:36 2007
@@ -20,7 +20,7 @@
 <composite xmlns="http://www.osoa.org/xmlns/sca/1.0" name="SpringSample">
 
     <component name="SpringSample">
-        <implementation.spring location="application-context.xml">
+        <implementation.spring location="/WEB-INF/application-context.xml">
             <service name="SpringBean">
                 <interface.java interface="sample.TestComponent"/>
                 <binding.socket port="8888"/>

Modified: incubator/tuscany/java/sca/extensions/spring/samples/server/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/extensions/spring/samples/server/src/main/webapp/WEB-INF/web.xml?view=diff&rev=501013&r1=501012&r2=501013
==============================================================================
--- incubator/tuscany/java/sca/extensions/spring/samples/server/src/main/webapp/WEB-INF/web.xml
(original)
+++ incubator/tuscany/java/sca/extensions/spring/samples/server/src/main/webapp/WEB-INF/web.xml
Mon Jan 29 03:35:36 2007
@@ -6,6 +6,11 @@
     <display-name>Tuscany Spring Sample</display-name>
 
     <context-param>
+       <param-name>tuscany.online</param-name>
+       <param-value>false</param-value>
+    </context-param>
+
+    <context-param>
         <param-name>currentCompositePath</param-name>
         <param-value>SpringSample</param-value>
     </context-param>



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


Mime
View raw message