TUSCANY-2391: Apply latest patch from Thilina Buddhika for GSoC project Tuscany SCA support in the Geronimo Admin Console

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

1 files changed, 64 insertions, 44 deletions

diff --git a/sandbox/thilina/geronimo_ACE/pom.xml b/sandbox/thilina/geronimo_ACE/pom.xml
index 9bbeb2ed9d..f5f2a8e7b6 100644
--- a/sandbox/thilina/geronimo_ACE/pom.xml
+++ b/sandbox/thilina/geronimo_ACE/pom.xml
@@ -1,44 +1,64 @@
-<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>
-  <groupId>org.apache.tuscany.geronimoace</groupId>
-  <artifactId>org.apache.tuscany.geronimoace.geronimo-ace</artifactId>
-  <packaging>war</packaging>
-  <version>1.0-SNAPSHOT</version>
-  <name>geronimo-ace</name>
-  <url>http://maven.apache.org</url>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-        <groupId>portlet-api</groupId>
-        <artifactId>portlet-api</artifactId>
-        <version>1.0</version>
-    </dependency>
-    <dependency>
-        <groupId>javax.portlet</groupId>
-        <artifactId>portlet-api</artifactId>
-        <version>1.0</version>
-    </dependency>
-
-    </dependencies>
-    <build>
-        <defaultGoal>install</defaultGoal>
-          <directory>${basedir}/target</directory>
-          <finalName>${artifactId}-${version}</finalName>
-          <resources>
-          <resource>
-            <targetPath>WEB-INF</targetPath>
-            <filtering>false</filtering>
-            <directory>${basedir}/src/webapp/WEB-INF</directory>
-            <includes>
-              <include>web.xml</include>
-            </includes>
-            </resource>
-        </resources>
-    </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>

+  <groupId>org.apache.tuscany.geronimoace</groupId>

+  <artifactId>org.apache.tuscany.geronimoace.geronimo-ace</artifactId>

+  <packaging>war</packaging>

+  <version>1.0-SNAPSHOT</version>

+  <name>geronimo-ace</name>

+  <url>http://maven.apache.org</url>

+  <dependencies>

+    <dependency>

+      <groupId>junit</groupId>

+      <artifactId>junit</artifactId>

+      <version>3.8.1</version>

+      <scope>test</scope>

+    </dependency>

+    <dependency>

+        <groupId>javax.portlet</groupId>

+        <artifactId>portlet-api</artifactId>

+        <version>1.0</version>

+    </dependency>

+    <dependency>

+            <groupId>javax.servlet</groupId>

+            <artifactId>servlet-api</artifactId>

+            <version>2.4</version> <!-- to keep compatible with older servlet containers -->

+            <scope>provided</scope>

+     </dependency>

+

+    </dependencies>

+    <build>

+        <defaultGoal>install</defaultGoal>

+          <directory>${basedir}/target</directory>

+          <finalName>${artifactId}-${version}</finalName>

+          <resources>

+          <resource>

+            <targetPath>WEB-INF</targetPath>

+            <filtering>false</filtering>

+            <directory>${basedir}/src/webapp/WEB-INF</directory>

+            <includes>

+              <include>web.xml</include>

+            </includes>

+            </resource>

+        </resources>

+    </build>

+</project>