From dcc69e02cd85b02d02aceab998c047a6019bfb43 Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 14 Oct 2010 09:34:47 +0000
Subject: Start to get rid of shades and replace with the aggregate jars. This
 moves the shades/base and base-nodep out of shades and into
 distribution/aggregates and updates to use those. The remaining ones in
 shades i think can probably just be deleted but i'll do that in separate
 steps.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1022443 13f79535-47bb-0310-9956-ffa450edef68
---
 .../trunk/unreleased/samples/jsonp-webapp/pom.xml  | 106 ++++++++++-----------
 1 file changed, 53 insertions(+), 53 deletions(-)

(limited to 'sca-java-2.x/trunk/unreleased/samples')

diff --git a/sca-java-2.x/trunk/unreleased/samples/jsonp-webapp/pom.xml b/sca-java-2.x/trunk/unreleased/samples/jsonp-webapp/pom.xml
index 8254ce61a5..fb4bd349fb 100644
--- a/sca-java-2.x/trunk/unreleased/samples/jsonp-webapp/pom.xml
+++ b/sca-java-2.x/trunk/unreleased/samples/jsonp-webapp/pom.xml
@@ -1,53 +1,53 @@
-<?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.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.apache.tuscany.sca</groupId>
-		<artifactId>tuscany-sca</artifactId>
-		<version>2.0-SNAPSHOT</version>
-		<relativePath>../../pom.xml</relativePath>
-	</parent>
-
-	<groupId>org.apache.tuscany.sca</groupId>
-	<artifactId>sample-jsonp-webapp</artifactId>
-	<packaging>war</packaging>
-	<version>1.0</version>
-	<name>jsonp-webapp</name>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.tuscany.sca.shades</groupId>
-			<artifactId>tuscany-base-nodep</artifactId>
-			<version>2.0-SNAPSHOT</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-binding-jsonp-runtime</artifactId>
-			<version>2.0-SNAPSHOT</version>
-			<type>jar</type>
-		</dependency>
-	</dependencies>
-	
-	<build>
-    	<finalName>jsonp-webapp</finalName>
-    </build>
-</project>
-
+<?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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.apache.tuscany.sca</groupId>
+		<artifactId>tuscany-sca</artifactId>
+		<version>2.0-SNAPSHOT</version>
+		<relativePath>../../pom.xml</relativePath>
+	</parent>
+
+	<groupId>org.apache.tuscany.sca</groupId>
+	<artifactId>sample-jsonp-webapp</artifactId>
+	<packaging>war</packaging>
+	<version>1.0</version>
+	<name>jsonp-webapp</name>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-base-runtime-nodep</artifactId>
+			<version>2.0-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-binding-jsonp-runtime</artifactId>
+			<version>2.0-SNAPSHOT</version>
+			<type>jar</type>
+		</dependency>
+	</dependencies>
+	
+	<build>
+    	<finalName>jsonp-webapp</finalName>
+    </build>
+</project>
+
-- 
cgit v1.2.3