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, 37 insertions, 40 deletions

diff --git a/sandbox/thilina/geronimo_ACE/src/main/webapp/WEB-INF/portlet.xml b/sandbox/thilina/geronimo_ACE/src/main/webapp/WEB-INF/portlet.xml
index f8f722e8cd..7989f30ed3 100644
--- a/sandbox/thilina/geronimo_ACE/src/main/webapp/WEB-INF/portlet.xml
+++ b/sandbox/thilina/geronimo_ACE/src/main/webapp/WEB-INF/portlet.xml
@@ -1,43 +1,40 @@
-<!--

-  ~ 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.

-  -->

-

-

 <?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.    

+-->

 <portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd" version="1.0"

-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd">

-  <portlet>

-    <description lang="EN">GeronimoACE</description>

-    <portlet-name>GeronimoACE</portlet-name>

-    <display-name lang="EN">Geronimo Admin Console for Tuscany</display-name>

-    <portlet-class>org.apache.tuscany.geronimoace.GeronimoACE</portlet-class>

-    <supports>

-      <mime-type>text/html</mime-type>

-      <portlet-mode>view</portlet-mode>

-    </supports>

-    <supported-locale>en</supported-locale>

-    <portlet-info>

-      <title>Tuscany Admin Console EXtension</title>

-      <short-title>Tuscany ACE</short-title>

-    </portlet-info>

+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+             xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd">

+    <portlet>

+        <description lang="EN">GeronimoACE</description>

+        <portlet-name>GeronimoACE</portlet-name>

+        <display-name lang="EN">Geronimo Admin Console for Tuscany</display-name>

+        <portlet-class>org.apache.tuscany.geronimoace.GeronimoACE</portlet-class>

+        <supports>

+            <mime-type>text/html</mime-type>

+            <portlet-mode>view</portlet-mode>

+            <portlet-mode>edit</portlet-mode>

+            <portlet-mode>help</portlet-mode>

+        </supports>

+        <supported-locale>en</supported-locale>

+        <portlet-info>

+            <title>Tuscany Admin Console EXtension</title>

+            <short-title>Tuscany ACE</short-title>

+        </portlet-info>

     </portlet>

-</portlet-app>

-

-

+</portlet-app>
\ No newline at end of file