geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From de...@apache.org
Subject svn commit: r960742 - in /geronimo/devtools/eclipse-plugin/trunk/plugins: org.apache.geronimo.j2ee.v11.jaxbmodel/ org.apache.geronimo.j2ee.v11.jaxbmodel/META-INF/ org.apache.geronimo.jaxbmodel.common/ org.apache.geronimo.jaxbmodel.common/src/main/java/...
Date Tue, 06 Jul 2010 01:43:49 GMT
Author: delos
Date: Tue Jul  6 01:43:48 2010
New Revision: 960742

URL: http://svn.apache.org/viewvc?rev=960742&view=rev
Log:
GERONIMODEVTOOLS-651 No deployment plan can be generated with 3.0 M1

Added:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/plugin/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/plugin/JAXB21PluginUtils.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/plugin/
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/plugin/JAXB22PluginUtils.java
Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/.classpath
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/.classpath
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/operations/IJAXBUtilsProvider.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/operations/JAXBUtils.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/.classpath
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/jaxbmodel/operations/JAXB21Utils.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/.classpath
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/.classpath
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v30/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/.classpath
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.schemas/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/.classpath
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/.classpath
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/GeronimoServer.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.schemas/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/.classpath
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/.classpath
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/.classpath
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/GeronimoServer.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/operations/GeronimoServerV21PluginManager.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/.classpath
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/.classpath
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/operations/GeronimoServerV22PluginManager.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/.classpath
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.jaxbmodel/.classpath
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.jaxbmodel/META-INF/MANIFEST.MF
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/.classpath

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/.classpath
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/.classpath?rev=960742&r1=960741&r2=960742&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/.classpath (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/.classpath Tue Jul  6 01:43:48 2010
@@ -1,28 +1,9 @@
-<?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.
-  -->
-
-<!-- @version $Rev$ $Date$ -->
-
-<classpath>
-    <classpathentry kind="src" path="src/main/java"/>
-    <classpathentry kind="src" path="src/test/java"/>
-    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-    <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-    <classpathentry kind="var" path="M2_REPO/xmlunit/xmlunit/1.3/xmlunit-1.3.jar"/>
-    <classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="src/test/java"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="var" path="M2_REPO/xmlunit/xmlunit/1.3/xmlunit-1.3.jar"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/META-INF/MANIFEST.MF?rev=960742&r1=960741&r2=960742&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.j2ee.v11.jaxbmodel/META-INF/MANIFEST.MF Tue Jul  6 01:43:48 2010
@@ -28,3 +28,4 @@ Export-Package: 
  org.apache.geronimo.j2ee.web
 Import-Package: junit.framework;version="3.8.2"
 Bundle-Activator: org.apache.geronimo.j2ee.jaxbmodel.Activator
+Bundle-ActivationPolicy: lazy

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/.classpath
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/.classpath?rev=960742&r1=960741&r2=960742&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/.classpath (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/.classpath Tue Jul  6 01:43:48 2010
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
-        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-        <classpathentry kind="var" path="M2_REPO/xmlunit/xmlunit/1.3/xmlunit-1.3.jar"/>
-        <classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="var" path="M2_REPO/xmlunit/xmlunit/1.3/xmlunit-1.3.jar"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/operations/IJAXBUtilsProvider.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/operations/IJAXBUtilsProvider.java?rev=960742&r1=960741&r2=960742&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/operations/IJAXBUtilsProvider.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/operations/IJAXBUtilsProvider.java Tue Jul  6 01:43:48 2010
@@ -29,7 +29,5 @@ import org.eclipse.core.resources.IFile;
 public interface IJAXBUtilsProvider {
 	 public JAXBContext getJAXBContext();
 	 public void marshalDeploymentPlan(JAXBElement jaxbElement, IFile file) throws Exception;
-	 public void marshalPlugin(JAXBElement jaxbElement, OutputStream outputStream) throws Exception;
 	 public JAXBElement unmarshalFilterDeploymentPlan(IFile file) throws Exception;
-	 public JAXBElement unmarshalPlugin(InputStream inputStream);
 }

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/operations/JAXBUtils.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/operations/JAXBUtils.java?rev=960742&r1=960741&r2=960742&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/operations/JAXBUtils.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jaxbmodel.common/src/main/java/org/apache/geronimo/jaxbmodel/common/operations/JAXBUtils.java Tue Jul  6 01:43:48 2010
@@ -126,15 +126,15 @@ public class JAXBUtils {
     	return provider.unmarshalFilterDeploymentPlan(file);
     }
 
-    public static void marshalPlugin(JAXBElement jaxbElement, OutputStream outputStream) throws Exception {
-        //currently only JAXB21Utils provide this method,so invoke it directly
-    	providers.get("2.1").marshalPlugin(jaxbElement, outputStream);
-    }
-
-    public static JAXBElement unmarshalPlugin(InputStream inputStream) {
-    	//currently only JAXB21Utils provide this method,so invoke it directly
-    	return providers.get("2.1").unmarshalPlugin(inputStream);
-    }
+//    public static void marshalPlugin(JAXBElement jaxbElement, OutputStream outputStream) throws Exception {
+//        //currently only JAXB21Utils provide this method,so invoke it directly
+//    	providers.get("2.1").marshalPlugin(jaxbElement, outputStream);
+//    }
+//
+//    public static JAXBElement unmarshalPlugin(InputStream inputStream) {
+//    	//currently only JAXB21Utils provide this method,so invoke it directly
+//    	return providers.get("2.1").unmarshalPlugin(inputStream);
+//    }
 
     public static Object getValue( Object element, String name ) throws Exception {
         try {

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/.classpath
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/.classpath?rev=960742&r1=960741&r2=960742&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/.classpath (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/.classpath Tue Jul  6 01:43:48 2010
@@ -1,28 +1,9 @@
-<?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.
-  -->
-
-<!-- @version $Rev$ $Date$ -->
-
-<classpath>
-    <classpathentry kind="src" path="src/main/java"/>
-    <classpathentry kind="src" path="src/test/java"/>
-    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-    <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-    <classpathentry kind="var" path="M2_REPO/xmlunit/xmlunit/1.3/xmlunit-1.3.jar"/>
-    <classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="src/test/java"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="var" path="M2_REPO/xmlunit/xmlunit/1.3/xmlunit-1.3.jar"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/META-INF/MANIFEST.MF?rev=960742&r1=960741&r2=960742&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/META-INF/MANIFEST.MF Tue Jul  6 01:43:48 2010
@@ -5,7 +5,6 @@ Bundle-SymbolicName: org.apache.geronimo
 Bundle-Version: 3.0.0
 Bundle-ClassPath: .
 Bundle-Vendor: Apache Software Foundation
-Bundle-Localization: plugin
 Require-Bundle: org.apache.geronimo.runtime.common,
  org.apache.geronimo.jaxbmodel.common,
  org.eclipse.core.runtime,
@@ -22,3 +21,4 @@ Export-Package: org.apache.geronimo.jee.
  org.apache.geronimo.jee.security,
  org.apache.geronimo.jee.web
 Import-Package: junit.framework;version="3.8.2"
+Bundle-ActivationPolicy: lazy

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/jaxbmodel/operations/JAXB21Utils.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/jaxbmodel/operations/JAXB21Utils.java?rev=960742&r1=960741&r2=960742&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/jaxbmodel/operations/JAXB21Utils.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/jaxbmodel/operations/JAXB21Utils.java Tue Jul  6 01:43:48 2010
@@ -18,9 +18,6 @@ package org.apache.geronimo.jee.jaxbmode
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Method;
@@ -64,12 +61,14 @@ public class JAXB21Utils implements IJAX
 
     // JAXBContext instantiation is costly - must be done only once!
     private static final JAXBContext jaxbContext = newJAXBContext();
-    private static final JAXBContext jaxbPluginContext = newJAXBPluginContext();
+    
     private static final MarshallerListener marshallerListener = new MarshallerListener();
     //private static JAXB21Utils _instance = new JAXB21Utils();
     
     private static JAXBContext newJAXBContext() {
-        try {
+        
+        try {            
+       
             return JAXBContext.newInstance( 
                     "org.apache.geronimo.jee.connector:" +
                     "org.apache.geronimo.jee.loginconfig:" +
@@ -98,16 +97,7 @@ public class JAXB21Utils implements IJAX
         return jaxbContext;
     }
 
-    private static JAXBContext newJAXBPluginContext() {
-        try {
-            return JAXBContext.newInstance( 
-                    "org.apache.geronimo.system.plugin.model", Activator.class.getClassLoader() );
-        } catch (JAXBException e) {
-            Trace.tracePoint("JAXBException", "JAXBContext.newInstance");
-            e.printStackTrace();
-        }
-        return null;
-    }
+  
     
     public void marshalDeploymentPlan(JAXBElement jaxbElement, IFile file) throws Exception {
         try {
@@ -192,76 +182,7 @@ public class JAXB21Utils implements IJAX
         }
     }
 
-    public void marshalPlugin(JAXBElement jaxbElement, OutputStream outputStream) throws Exception {
-        try {
-            Marshaller marshaller = jaxbPluginContext.createMarshaller();
-            marshaller.setListener(marshallerListener);
-
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            DocumentBuilder db = dbf.newDocumentBuilder();
-            Document doc = db.newDocument(); 
-
-            marshaller.marshal(jaxbElement, doc);
-
-            TransformerFactory xf = TransformerFactory.newInstance();
-            try {
-                xf.setAttribute("indent-number", new Integer(4));
-            } catch (IllegalArgumentException iae) {
-                //ignore this. http://forums.sun.com/thread.jspa?threadID=562510&messageID=2841867
-            }
-            Transformer xformer = xf.newTransformer();
-            xformer.setOutputProperty(OutputKeys.METHOD, "xml");
-            xformer.setOutputProperty(OutputKeys.INDENT, "yes");
-            xformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
-            xformer.setOutputProperty("{http://xml.apache.org/xalan}indent-amount", "4"); 
-
-            ByteArrayOutputStream outBuffer = new ByteArrayOutputStream();
-            Result out = new StreamResult(new OutputStreamWriter(outBuffer,"UTF-8"));
-
-            xformer.transform(new DOMSource(doc), out);
-            ByteArrayInputStream inBuffer = new ByteArrayInputStream(outBuffer.toByteArray());
-            outputStream.write(outBuffer.toByteArray());
-        } catch (JAXBException jaxbException) {
-            Trace.tracePoint("JAXBException", "JAXBUtils.marshalDeploymentPlan()");
-            throw jaxbException;
-        } catch (IOException coreException) {
-            Trace.tracePoint("IOException", "JAXBUtils.marshalDeploymentPlan()");
-            throw coreException;
-        } catch (ParserConfigurationException e) {
-            Trace.tracePoint("ParserConfigurationException", "JAXBUtils.marshalDeploymentPlan()");
-            throw e;
-        } catch (TransformerConfigurationException e) {
-            Trace.tracePoint("TransformerConfigurationException", "JAXBUtils.marshalDeploymentPlan()");
-            throw e;
-        } catch (TransformerException e) {
-            Trace.tracePoint("TransformerException", "JAXBUtils.marshalDeploymentPlan()");
-            throw e;
-        }
-    }
-
-    public JAXBElement unmarshalPlugin(InputStream inputStream) {
-        try {
-            Unmarshaller unmarshaller = jaxbPluginContext.createUnmarshaller();
-            SAXParserFactory factory = SAXParserFactory.newInstance();
-            factory.setNamespaceAware(true);
-            factory.setValidating(false);
-            SAXParser parser = factory.newSAXParser();
-            NamespaceFilter xmlFilter = new NamespaceFilter(parser.getXMLReader());
-            SAXSource source = new SAXSource(xmlFilter, new InputSource(inputStream));
-            JAXBElement plan = (JAXBElement) unmarshaller.unmarshal(source);
-            return plan;
-        } catch (JAXBException e) {
-            Trace.tracePoint("JAXBException", "JAXBUtils.unmarshalFilterDeploymentPlan()");
-            e.printStackTrace();
-        } catch (ParserConfigurationException e) {
-            Trace.tracePoint("ParserConfigurationException", "JAXBUtils.unmarshalFilterDeploymentPlan()");
-            e.printStackTrace();
-        } catch (SAXException e) {
-            Trace.tracePoint("SAXException", "JAXBUtils.unmarshalFilterDeploymentPlan()");
-            e.printStackTrace();
-        }
-        return null;
-    }
+   
 
     private void prepareFolder(IContainer folder) throws CoreException {
         if (folder.exists() || !(folder instanceof IFolder)) {

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/.classpath
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/.classpath?rev=960742&r1=960741&r2=960742&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/.classpath (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/.classpath Tue Jul  6 01:43:48 2010
@@ -3,9 +3,9 @@
 	<classpathentry exported="true" kind="lib" path="lib/cglib-nodep-2.1_3.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-logging-1.1.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/geronimo-activation_1.1_spec-1.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/geronimo-jaxb_2.2_spec-1.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/geronimo-stax-api_1.2_spec-1.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jaxb-impl-2.2_1.jar" sourcepath="/media/g/tbd/jaxb/jaxb-impl-2.2-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/geronimo-javaee-deployment_1.1MR3_spec-1.0.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/geronimo-jaxb_2.2_spec-1.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jaxb-impl-2.2_1.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF?rev=960742&r1=960741&r2=960742&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF Tue Jul  6 01:43:48 2010
@@ -3,16 +3,18 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Geronimo Common Runtime Plug-in
 Bundle-SymbolicName: org.apache.geronimo.runtime.common;singleton:=true
 Bundle-Version: 3.0.0
-Bundle-ClassPath: 
- lib/commons-logging-1.1.1.jar,
- lib/cglib-nodep-2.1_3.jar,
+Bundle-ClassPath: .,
+ lib/geronimo-stax-api_1.2_spec-1.0.jar,
  lib/geronimo-jaxb_2.2_spec-1.0.jar,
  lib/jaxb-impl-2.2_1.jar,
- lib/geronimo-stax-api_1.2_spec-1.0.jar,
+ lib/commons-logging-1.1.1.jar,
+ lib/cglib-nodep-2.1_3.jar,
  lib/geronimo-activation_1.1_spec-1.1.jar,
  lib/geronimo-javaee-deployment_1.1MR3_spec-1.0.1.jar
 Export-Package: 
  com.sun.istack,
+ com.sun.istack.localization,
+ com.sun.istack.logging,
  com.sun.xml.bind,
  com.sun.xml.bind.annotation,
  com.sun.xml.bind.api,
@@ -34,20 +36,78 @@ Export-Package: 
  com.sun.xml.bind.v2.runtime.reflect.opt,
  com.sun.xml.bind.v2.runtime.unmarshaller,
  com.sun.xml.bind.v2.schemagen,
+ com.sun.xml.bind.v2.schemagen.episode,
  com.sun.xml.bind.v2.schemagen.xmlschema,
  com.sun.xml.bind.v2.util,
  com.sun.xml.txw2,
  com.sun.xml.txw2.annotation,
  com.sun.xml.txw2.output,
+ javax.activation,
+ javax.enterprise.deploy.model,
+ javax.enterprise.deploy.model.exceptions,
+ javax.enterprise.deploy.shared,
+ javax.enterprise.deploy.shared.factories,
+ javax.enterprise.deploy.spi,
+ javax.enterprise.deploy.spi.exceptions,
+ javax.enterprise.deploy.spi.factories,
+ javax.enterprise.deploy.spi.status,
  javax.xml.bind,
  javax.xml.bind.annotation,
  javax.xml.bind.annotation.adapters,
  javax.xml.bind.attachment,
  javax.xml.bind.helpers,
  javax.xml.bind.util,
+ javax.xml.namespace,
  javax.xml.stream,
  javax.xml.stream.events,
  javax.xml.stream.util,
+ net.sf.cglib.asm,
+ net.sf.cglib.asm.attrs,
+ net.sf.cglib.beans,
+ net.sf.cglib.core,
+ net.sf.cglib.proxy,
+ net.sf.cglib.reflect,
+ net.sf.cglib.transform,
+ net.sf.cglib.transform.hook,
+ net.sf.cglib.transform.impl,
+ net.sf.cglib.util,
+ org.apache.commons.logging,
+ org.apache.commons.logging.impl,
+ org.apache.geronimo.osgi.locator,
+ org.apache.geronimo.specs.activation
+Bundle-Vendor: Apache Software Foundation
+Import-Package: 
+ com.sun.istack,
+ com.sun.istack.localization,
+ com.sun.istack.logging,
+ com.sun.xml.bind,
+ com.sun.xml.bind.annotation,
+ com.sun.xml.bind.api,
+ com.sun.xml.bind.api.impl,
+ com.sun.xml.bind.marshaller,
+ com.sun.xml.bind.unmarshaller,
+ com.sun.xml.bind.util,
+ com.sun.xml.bind.v2,
+ com.sun.xml.bind.v2.bytecode,
+ com.sun.xml.bind.v2.model.annotation,
+ com.sun.xml.bind.v2.model.core,
+ com.sun.xml.bind.v2.model.impl,
+ com.sun.xml.bind.v2.model.nav,
+ com.sun.xml.bind.v2.model.runtime,
+ com.sun.xml.bind.v2.runtime,
+ com.sun.xml.bind.v2.runtime.output,
+ com.sun.xml.bind.v2.runtime.property,
+ com.sun.xml.bind.v2.runtime.reflect,
+ com.sun.xml.bind.v2.runtime.reflect.opt,
+ com.sun.xml.bind.v2.runtime.unmarshaller,
+ com.sun.xml.bind.v2.schemagen,
+ com.sun.xml.bind.v2.schemagen.episode,
+ com.sun.xml.bind.v2.schemagen.xmlschema,
+ com.sun.xml.bind.v2.util,
+ com.sun.xml.txw2,
+ com.sun.xml.txw2.annotation,
+ com.sun.xml.txw2.output,
+ javax.activation,
  javax.enterprise.deploy.model,
  javax.enterprise.deploy.model.exceptions,
  javax.enterprise.deploy.shared,
@@ -56,6 +116,16 @@ Export-Package: 
  javax.enterprise.deploy.spi.exceptions,
  javax.enterprise.deploy.spi.factories,
  javax.enterprise.deploy.spi.status,
+ javax.xml.bind,
+ javax.xml.bind.annotation,
+ javax.xml.bind.annotation.adapters,
+ javax.xml.bind.attachment,
+ javax.xml.bind.helpers,
+ javax.xml.bind.util,
+ javax.xml.namespace,
+ javax.xml.stream,
+ javax.xml.stream.events,
+ javax.xml.stream.util,
  net.sf.cglib.asm,
  net.sf.cglib.asm.attrs,
  net.sf.cglib.beans,
@@ -67,5 +137,6 @@ Export-Package: 
  net.sf.cglib.transform.impl,
  net.sf.cglib.util,
  org.apache.commons.logging,
- org.apache.commons.logging.impl
-Bundle-Vendor: Apache Software Foundation
+ org.apache.commons.logging.impl,
+ org.apache.geronimo.osgi.locator,
+ org.apache.geronimo.specs.activation

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/.classpath
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/.classpath?rev=960742&r1=960741&r2=960742&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/.classpath (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/.classpath Tue Jul  6 01:43:48 2010
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/geronimo-common-2.1.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/geronimo-crypto-2.1.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/geronimo-deploy-config-2.1.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/geronimo-deploy-jsr88-2.1.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/geronimo-deployment-2.1.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/geronimo-j2ee-schema-2.1.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/geronimo-kernel-2.1.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/geronimo-plugin-2.1.4.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/geronimo-system-2.1.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/geronimo-common-2.1.5.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/geronimo-crypto-2.1.5.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/geronimo-deploy-config-2.1.5.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/geronimo-deploy-jsr88-2.1.5.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/geronimo-deployment-2.1.5.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/geronimo-j2ee-schema-2.1.5.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/geronimo-kernel-2.1.5.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/geronimo-plugin-2.1.5.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/geronimo-system-2.1.5.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/plexus-archiver-1.0-alpha-12.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/slf4j-api-1.5.5.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/slf4j-simple-1.5.5.jar"/>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF?rev=960742&r1=960741&r2=960742&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/META-INF/MANIFEST.MF Tue Jul  6 01:43:48 2010
@@ -4,17 +4,17 @@ Bundle-Name: Geronimo V21 Runtime Plug-i
 Bundle-SymbolicName: org.apache.geronimo.runtime.v21;singleton:=true
 Bundle-Version: 3.0.0
 Require-Bundle: org.apache.geronimo.runtime.common;visibility:=reexport
-Bundle-ClassPath: lib/geronimo-common-2.1.4.jar,
- lib/geronimo-deploy-jsr88-2.1.4.jar,
- lib/geronimo-deployment-2.1.4.jar,
- lib/geronimo-j2ee-schema-2.1.4.jar,
- lib/geronimo-kernel-2.1.4.jar,
- lib/geronimo-plugin-2.1.4.jar,
- lib/geronimo-system-2.1.4.jar,
- lib/geronimo-util-2.1.4.jar,
- lib/geronimo-deploy-config-2.1.4.jar,
+Bundle-ClassPath: lib/geronimo-common-2.1.5.jar,
+ lib/geronimo-deploy-jsr88-2.1.5.jar,
+ lib/geronimo-deployment-2.1.5.jar,
+ lib/geronimo-j2ee-schema-2.1.5.jar,
+ lib/geronimo-kernel-2.1.5.jar,
+ lib/geronimo-plugin-2.1.5.jar,
+ lib/geronimo-system-2.1.5.jar,
+ lib/geronimo-util-2.1.5.jar,
+ lib/geronimo-deploy-config-2.1.5.jar,
  lib/plexus-archiver-1.0-alpha-12.jar,
- lib/geronimo-crypto-2.1.4.jar,
+ lib/geronimo-crypto-2.1.5.jar,
  lib/slf4j-api-1.5.5.jar,
  lib/slf4j-simple-1.5.5.jar
 Export-Package: 

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/pom.xml?rev=960742&r1=960741&r2=960742&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/pom.xml Tue Jul  6 01:43:48 2010
@@ -33,7 +33,7 @@
     </parent>
 
     <properties>
-        <geronimoVersion>2.1.4</geronimoVersion>
+        <geronimoVersion>2.1.5</geronimoVersion>
     </properties>
     <build>
         <resources>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v30/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v30/META-INF/MANIFEST.MF?rev=960742&r1=960741&r2=960742&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v30/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v30/META-INF/MANIFEST.MF Tue Jul  6 01:43:48 2010
@@ -18,19 +18,39 @@ Bundle-ClassPath: lib/geronimo-common-3.
  lib/geronimo-crypto-3.0-M1.jar,
  lib/slf4j-api-1.5.5.jar,
  lib/slf4j-simple-1.5.5.jar
-Export-Package:  
+Export-Package: 
  org.apache.geronimo.common,
  org.apache.geronimo.common.propertyeditor,
+ org.apache.geronimo.crypto,
+ org.apache.geronimo.crypto.asn1,
+ org.apache.geronimo.crypto.asn1.cryptopro,
+ org.apache.geronimo.crypto.asn1.misc,
+ org.apache.geronimo.crypto.asn1.oiw,
+ org.apache.geronimo.crypto.asn1.pkcs,
+ org.apache.geronimo.crypto.asn1.sec,
+ org.apache.geronimo.crypto.asn1.util,
+ org.apache.geronimo.crypto.asn1.x509,
+ org.apache.geronimo.crypto.asn1.x9,
+ org.apache.geronimo.crypto.crypto,
+ org.apache.geronimo.crypto.crypto.digests,
+ org.apache.geronimo.crypto.crypto.modes,
+ org.apache.geronimo.crypto.crypto.params,
+ org.apache.geronimo.crypto.encoders,
+ org.apache.geronimo.crypto.jce,
+ org.apache.geronimo.crypto.jce.interfaces,
+ org.apache.geronimo.crypto.jce.provider,
  org.apache.geronimo.deployment,
  org.apache.geronimo.deployment.plugin,
  org.apache.geronimo.deployment.plugin.factories,
  org.apache.geronimo.deployment.plugin.jmx,
  org.apache.geronimo.deployment.plugin.local,
  org.apache.geronimo.deployment.plugin.remote,
+ org.apache.geronimo.deployment.spi,
  org.apache.geronimo.deployment.util,
  org.apache.geronimo.deployment.xml,
  org.apache.geronimo.deployment.xmlbeans,
  org.apache.geronimo.gbean,
+ org.apache.geronimo.gbean.annotation,
  org.apache.geronimo.gbean.runtime,
  org.apache.geronimo.kernel,
  org.apache.geronimo.kernel.basic,
@@ -39,6 +59,7 @@ Export-Package:  
  org.apache.geronimo.kernel.config.xstream,
  org.apache.geronimo.kernel.lifecycle,
  org.apache.geronimo.kernel.management,
+ org.apache.geronimo.kernel.osgi,
  org.apache.geronimo.kernel.proxy,
  org.apache.geronimo.kernel.repository,
  org.apache.geronimo.kernel.rmi,
@@ -48,8 +69,10 @@ Export-Package:  
  org.apache.geronimo.system.configuration.cli,
  org.apache.geronimo.system.configuration.condition,
  org.apache.geronimo.system.jmx,
+ org.apache.geronimo.system.logging,
  org.apache.geronimo.system.logging.log4j,
  org.apache.geronimo.system.main,
+ org.apache.geronimo.system.osgi,
  org.apache.geronimo.system.plugin,
  org.apache.geronimo.system.plugin.model,
  org.apache.geronimo.system.properties,
@@ -69,5 +92,9 @@ Export-Package:  
  org.codehaus.plexus.archiver.tar,
  org.codehaus.plexus.archiver.util,
  org.codehaus.plexus.archiver.war,
- org.codehaus.plexus.archiver.zip
+ org.codehaus.plexus.archiver.zip,
+ org.slf4j,
+ org.slf4j.helpers,
+ org.slf4j.impl,
+ org.slf4j.spi
 Bundle-Vendor: Apache Software Foundation

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/.classpath
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/.classpath?rev=960742&r1=960741&r2=960742&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/.classpath (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/.classpath Tue Jul  6 01:43:48 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.schemas/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.schemas/META-INF/MANIFEST.MF?rev=960742&r1=960741&r2=960742&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.schemas/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.schemas/META-INF/MANIFEST.MF Tue Jul  6 01:43:48 2010
@@ -5,3 +5,4 @@ Bundle-SymbolicName: org.apache.geronimo
 Bundle-Version: 3.0.0
 Require-Bundle: org.eclipse.wst.xml.core
 Bundle-Vendor: Apache Software Foundation
+Bundle-ActivationPolicy: lazy

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/.classpath
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/.classpath?rev=960742&r1=960741&r2=960742&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/.classpath (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/.classpath Tue Jul  6 01:43:48 2010
@@ -1,26 +1,7 @@
 <?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.
-  -->
-
-<!-- @version $Rev$ $Date$ -->
-
 <classpath>
-    <classpathentry kind="src" path="src/main/java"/>
-    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-    <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-    <classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/.classpath
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/.classpath?rev=960742&r1=960741&r2=960742&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/.classpath (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/.classpath Tue Jul  6 01:43:48 2010
@@ -1,26 +1,7 @@
-<?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.
-  -->
-
-<!-- @version $Rev$ $Date$ -->
-
-<classpath>
-    <classpathentry kind="src" path="src/main/java"/>
-    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-    <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-    <classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/GeronimoServer.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/GeronimoServer.java?rev=960742&r1=960741&r2=960742&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/GeronimoServer.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.core/src/main/java/org/apache/geronimo/st/v11/core/GeronimoServer.java Tue Jul  6 01:43:48 2010
@@ -115,9 +115,8 @@ public class GeronimoServer extends Gero
 	        return getAttribute(PROPERTY_NOT_REDEPLOY_JSP_FILES,false);
 	}
 
-	@Override
-	public IGeronimoServerPluginManager getServerPluginManager() {
-		// TODO:implement GeronimoServlerPluginManager for v11 adapter
-		return null;
-	}
+    public IGeronimoServerPluginManager getServerPluginManager() {
+        return null;
+    }
+
 }
\ No newline at end of file

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.schemas/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.schemas/META-INF/MANIFEST.MF?rev=960742&r1=960741&r2=960742&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.schemas/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.schemas/META-INF/MANIFEST.MF Tue Jul  6 01:43:48 2010
@@ -5,3 +5,4 @@ Bundle-SymbolicName: org.apache.geronimo
 Bundle-Version: 3.0.0
 Require-Bundle: org.eclipse.wst.xml.core
 Bundle-Vendor: Apache Software Foundation
+Bundle-ActivationPolicy: lazy

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/.classpath
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/.classpath?rev=960742&r1=960741&r2=960742&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/.classpath (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/.classpath Tue Jul  6 01:43:48 2010
@@ -1,26 +1,7 @@
-<?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.
-  -->
-
-<!-- @version $Rev$ $Date$ -->
-
-<classpath>
-    <classpathentry kind="src" path="src/main/java"/>
-    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-    <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-    <classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/.classpath
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/.classpath?rev=960742&r1=960741&r2=960742&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/.classpath (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/.classpath Tue Jul  6 01:43:48 2010
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/.classpath
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/.classpath?rev=960742&r1=960741&r2=960742&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/.classpath (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/.classpath Tue Jul  6 01:43:48 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/GeronimoServer.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/GeronimoServer.java?rev=960742&r1=960741&r2=960742&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/GeronimoServer.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/GeronimoServer.java Tue Jul  6 01:43:48 2010
@@ -206,8 +206,8 @@ public class GeronimoServer extends Gero
         return getAttribute(PROPERTY_NOT_REDEPLOY_JSP_FILES,false);
     }
 
-	@Override
-	public IGeronimoServerPluginManager getServerPluginManager() {
-		return new GeronimoServerV21PluginManager(this.getServer());
-	}
+    public IGeronimoServerPluginManager getServerPluginManager() {
+        return new GeronimoServerV21PluginManager(this.getServer());
+    }
+
 }
\ No newline at end of file

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/operations/GeronimoServerV21PluginManager.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/operations/GeronimoServerV21PluginManager.java?rev=960742&r1=960741&r2=960742&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/operations/GeronimoServerV21PluginManager.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/operations/GeronimoServerV21PluginManager.java Tue Jul  6 01:43:48 2010
@@ -58,6 +58,7 @@ import org.apache.geronimo.st.core.Geron
 import org.apache.geronimo.st.core.GeronimoServerBehaviourDelegate;
 import org.apache.geronimo.st.core.operations.IGeronimoServerPluginManager;
 import org.apache.geronimo.st.v21.core.internal.Trace;
+import org.apache.geronimo.st.v21.core.plugin.JAXB21PluginUtils;
 import org.apache.geronimo.system.jmx.KernelDelegate;
 import org.apache.geronimo.system.plugin.PluginInstaller;
 import org.apache.geronimo.system.plugin.model.ArtifactType;
@@ -415,7 +416,7 @@ public class GeronimoServerV21PluginMana
 
     public PluginListType loadPluginList (InputStream in) {
         try {
-            JAXBElement pluginListElement = JAXBUtils.unmarshalPlugin(in);
+            JAXBElement pluginListElement = JAXB21PluginUtils.unmarshalPlugin(in);
             return (PluginListType)pluginListElement.getValue();
         }
         catch (Throwable e) {
@@ -428,7 +429,7 @@ public class GeronimoServerV21PluginMana
         try {
             ObjectFactory jeeFactory = new ObjectFactory();
             JAXBElement element = jeeFactory.createGeronimoPluginList(pluginList);
-            JAXBUtils.marshalPlugin(element, out);
+            JAXB21PluginUtils.marshalPlugin(element, out);
         }
         catch (Throwable e) {
             e.printStackTrace();
@@ -439,7 +440,7 @@ public class GeronimoServerV21PluginMana
         try {
             ObjectFactory jeeFactory = new ObjectFactory();
             JAXBElement element = jeeFactory.createGeronimoPlugin(metadata);
-            JAXBUtils.marshalPlugin(element, out);
+            JAXB21PluginUtils.marshalPlugin(element, out);
         }
         catch (Throwable e) {
             e.printStackTrace();

Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/plugin/JAXB21PluginUtils.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/plugin/JAXB21PluginUtils.java?rev=960742&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/plugin/JAXB21PluginUtils.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/plugin/JAXB21PluginUtils.java Tue Jul  6 01:43:48 2010
@@ -0,0 +1,147 @@
+/*
+ * 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 org.apache.geronimo.st.v21.core.plugin;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Marshaller;
+import javax.xml.bind.Unmarshaller;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Result;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.stream.StreamResult;
+
+import org.apache.geronimo.jaxbmodel.common.operations.NamespaceFilter;
+import org.apache.geronimo.jee.jaxbmodel.operations.MarshallerListener;
+import org.apache.geronimo.st.v21.core.Activator;
+import org.apache.geronimo.st.v21.core.internal.Trace;
+import org.w3c.dom.Document;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+/*
+ * This class is used to handle operations on packages org.apache.geronimo.system.plugin.model.
+ * Since this package is version specific, the utils class is not included in v21.jaxbmodel 
+ * 
+ *
+ */
+public class JAXB21PluginUtils {
+
+    private static final JAXBContext jaxbPluginContext = newJAXBPluginContext();
+    private static final MarshallerListener marshallerListener = new MarshallerListener();
+    
+    public static void marshalPlugin(JAXBElement jaxbElement, OutputStream outputStream) throws Exception {
+        try {
+            Marshaller marshaller = jaxbPluginContext.createMarshaller();
+            marshaller.setListener(marshallerListener);
+
+            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+            DocumentBuilder db = dbf.newDocumentBuilder();
+            Document doc = db.newDocument(); 
+
+            marshaller.marshal(jaxbElement, doc);
+
+            TransformerFactory xf = TransformerFactory.newInstance();
+            try {
+                xf.setAttribute("indent-number", new Integer(4));
+            } catch (IllegalArgumentException iae) {
+                //ignore this. http://forums.sun.com/thread.jspa?threadID=562510&messageID=2841867
+            }
+            Transformer xformer = xf.newTransformer();
+            xformer.setOutputProperty(OutputKeys.METHOD, "xml");
+            xformer.setOutputProperty(OutputKeys.INDENT, "yes");
+            xformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
+            xformer.setOutputProperty("{http://xml.apache.org/xalan}indent-amount", "4"); 
+
+            ByteArrayOutputStream outBuffer = new ByteArrayOutputStream();
+            Result out = new StreamResult(new OutputStreamWriter(outBuffer,"UTF-8"));
+
+            xformer.transform(new DOMSource(doc), out);
+            ByteArrayInputStream inBuffer = new ByteArrayInputStream(outBuffer.toByteArray());
+            outputStream.write(outBuffer.toByteArray());
+        } catch (JAXBException jaxbException) {
+            Trace.tracePoint("JAXBException", "JAXBUtils.marshalDeploymentPlan()");
+            throw jaxbException;
+        } catch (IOException coreException) {
+            Trace.tracePoint("IOException", "JAXBUtils.marshalDeploymentPlan()");
+            throw coreException;
+        } catch (ParserConfigurationException e) {
+            Trace.tracePoint("ParserConfigurationException", "JAXBUtils.marshalDeploymentPlan()");
+            throw e;
+        } catch (TransformerConfigurationException e) {
+            Trace.tracePoint("TransformerConfigurationException", "JAXBUtils.marshalDeploymentPlan()");
+            throw e;
+        } catch (TransformerException e) {
+            Trace.tracePoint("TransformerException", "JAXBUtils.marshalDeploymentPlan()");
+            throw e;
+        }
+    }
+
+    public static JAXBElement unmarshalPlugin(InputStream inputStream) {
+        try {
+            Unmarshaller unmarshaller = jaxbPluginContext.createUnmarshaller();
+            SAXParserFactory factory = SAXParserFactory.newInstance();
+            factory.setNamespaceAware(true);
+            factory.setValidating(false);
+            SAXParser parser = factory.newSAXParser();
+            NamespaceFilter xmlFilter = new NamespaceFilter(parser.getXMLReader());
+            SAXSource source = new SAXSource(xmlFilter, new InputSource(inputStream));
+            JAXBElement plan = (JAXBElement) unmarshaller.unmarshal(source);
+            return plan;
+        } catch (JAXBException e) {
+            Trace.tracePoint("JAXBException", "JAXBUtils.unmarshalFilterDeploymentPlan()");
+            e.printStackTrace();
+        } catch (ParserConfigurationException e) {
+            Trace.tracePoint("ParserConfigurationException", "JAXBUtils.unmarshalFilterDeploymentPlan()");
+            e.printStackTrace();
+        } catch (SAXException e) {
+            Trace.tracePoint("SAXException", "JAXBUtils.unmarshalFilterDeploymentPlan()");
+            e.printStackTrace();
+        }
+        return null;
+    }
+    
+    private static JAXBContext newJAXBPluginContext() {
+        try {
+            return JAXBContext.newInstance( 
+                    "org.apache.geronimo.system.plugin.model", Activator.class.getClassLoader() );
+        } catch (JAXBException e) {
+            Trace.tracePoint("JAXBException", "JAXBContext.newInstance");
+            e.printStackTrace();
+        }
+        return null;
+    }
+}

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/.classpath
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/.classpath?rev=960742&r1=960741&r2=960742&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/.classpath (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/.classpath Tue Jul  6 01:43:48 2010
@@ -1,26 +1,7 @@
-<?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.
-  -->
-
-<!-- @version $Rev$ $Date$ -->
-
-<classpath>
-    <classpathentry kind="src" path="src/main/java"/>
-    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-    <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-    <classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/.classpath
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/.classpath?rev=960742&r1=960741&r2=960742&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/.classpath (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/.classpath Tue Jul  6 01:43:48 2010
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/operations/GeronimoServerV22PluginManager.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/operations/GeronimoServerV22PluginManager.java?rev=960742&r1=960741&r2=960742&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/operations/GeronimoServerV22PluginManager.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/operations/GeronimoServerV22PluginManager.java Tue Jul  6 01:43:48 2010
@@ -58,6 +58,7 @@ import org.apache.geronimo.st.core.Geron
 import org.apache.geronimo.st.core.GeronimoServerBehaviourDelegate;
 import org.apache.geronimo.st.core.operations.IGeronimoServerPluginManager;
 import org.apache.geronimo.st.v21.core.internal.Trace;
+import org.apache.geronimo.st.v22.core.plugin.JAXB22PluginUtils;
 import org.apache.geronimo.system.jmx.KernelDelegate;
 import org.apache.geronimo.system.plugin.PluginInstaller;
 import org.apache.geronimo.system.plugin.model.ArtifactType;
@@ -415,7 +416,7 @@ public class GeronimoServerV22PluginMana
 
     public PluginListType loadPluginList (InputStream in) {
         try {
-            JAXBElement pluginListElement = JAXBUtils.unmarshalPlugin(in);
+            JAXBElement pluginListElement = JAXB22PluginUtils.unmarshalPlugin(in);
             return (PluginListType)pluginListElement.getValue();
         }
         catch (Throwable e) {
@@ -428,7 +429,7 @@ public class GeronimoServerV22PluginMana
         try {
             ObjectFactory jeeFactory = new ObjectFactory();
             JAXBElement element = jeeFactory.createGeronimoPluginList(pluginList);
-            JAXBUtils.marshalPlugin(element, out);
+            JAXB22PluginUtils.marshalPlugin(element, out);
         }
         catch (Throwable e) {
             e.printStackTrace();
@@ -439,7 +440,7 @@ public class GeronimoServerV22PluginMana
         try {
             ObjectFactory jeeFactory = new ObjectFactory();
             JAXBElement element = jeeFactory.createGeronimoPlugin(metadata);
-            JAXBUtils.marshalPlugin(element, out);
+            JAXB22PluginUtils.marshalPlugin(element, out);
         }
         catch (Throwable e) {
             e.printStackTrace();

Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/plugin/JAXB22PluginUtils.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/plugin/JAXB22PluginUtils.java?rev=960742&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/plugin/JAXB22PluginUtils.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v22.core/src/main/java/org/apache/geronimo/st/v22/core/plugin/JAXB22PluginUtils.java Tue Jul  6 01:43:48 2010
@@ -0,0 +1,147 @@
+/*
+ * 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 org.apache.geronimo.st.v22.core.plugin;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Marshaller;
+import javax.xml.bind.Unmarshaller;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Result;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.stream.StreamResult;
+
+import org.apache.geronimo.jaxbmodel.common.operations.NamespaceFilter;
+import org.apache.geronimo.jee.jaxbmodel.operations.MarshallerListener;
+import org.apache.geronimo.st.v21.core.Activator;
+import org.apache.geronimo.st.v21.core.internal.Trace;
+import org.w3c.dom.Document;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+/*
+ * This class is used to handle operations on packages org.apache.geronimo.system.plugin.model.
+ * Since this package is version specific, the utils class is not included in v21.jaxbmodel 
+ * 
+ *
+ */
+public class JAXB22PluginUtils {
+
+    private static final JAXBContext jaxbPluginContext = newJAXBPluginContext();
+    private static final MarshallerListener marshallerListener = new MarshallerListener();
+    
+    public static void marshalPlugin(JAXBElement jaxbElement, OutputStream outputStream) throws Exception {
+        try {
+            Marshaller marshaller = jaxbPluginContext.createMarshaller();
+            marshaller.setListener(marshallerListener);
+
+            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+            DocumentBuilder db = dbf.newDocumentBuilder();
+            Document doc = db.newDocument(); 
+
+            marshaller.marshal(jaxbElement, doc);
+
+            TransformerFactory xf = TransformerFactory.newInstance();
+            try {
+                xf.setAttribute("indent-number", new Integer(4));
+            } catch (IllegalArgumentException iae) {
+                //ignore this. http://forums.sun.com/thread.jspa?threadID=562510&messageID=2841867
+            }
+            Transformer xformer = xf.newTransformer();
+            xformer.setOutputProperty(OutputKeys.METHOD, "xml");
+            xformer.setOutputProperty(OutputKeys.INDENT, "yes");
+            xformer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
+            xformer.setOutputProperty("{http://xml.apache.org/xalan}indent-amount", "4"); 
+
+            ByteArrayOutputStream outBuffer = new ByteArrayOutputStream();
+            Result out = new StreamResult(new OutputStreamWriter(outBuffer,"UTF-8"));
+
+            xformer.transform(new DOMSource(doc), out);
+            ByteArrayInputStream inBuffer = new ByteArrayInputStream(outBuffer.toByteArray());
+            outputStream.write(outBuffer.toByteArray());
+        } catch (JAXBException jaxbException) {
+            Trace.tracePoint("JAXBException", "JAXBUtils.marshalDeploymentPlan()");
+            throw jaxbException;
+        } catch (IOException coreException) {
+            Trace.tracePoint("IOException", "JAXBUtils.marshalDeploymentPlan()");
+            throw coreException;
+        } catch (ParserConfigurationException e) {
+            Trace.tracePoint("ParserConfigurationException", "JAXBUtils.marshalDeploymentPlan()");
+            throw e;
+        } catch (TransformerConfigurationException e) {
+            Trace.tracePoint("TransformerConfigurationException", "JAXBUtils.marshalDeploymentPlan()");
+            throw e;
+        } catch (TransformerException e) {
+            Trace.tracePoint("TransformerException", "JAXBUtils.marshalDeploymentPlan()");
+            throw e;
+        }
+    }
+
+    public static JAXBElement unmarshalPlugin(InputStream inputStream) {
+        try {
+            Unmarshaller unmarshaller = jaxbPluginContext.createUnmarshaller();
+            SAXParserFactory factory = SAXParserFactory.newInstance();
+            factory.setNamespaceAware(true);
+            factory.setValidating(false);
+            SAXParser parser = factory.newSAXParser();
+            NamespaceFilter xmlFilter = new NamespaceFilter(parser.getXMLReader());
+            SAXSource source = new SAXSource(xmlFilter, new InputSource(inputStream));
+            JAXBElement plan = (JAXBElement) unmarshaller.unmarshal(source);
+            return plan;
+        } catch (JAXBException e) {
+            Trace.tracePoint("JAXBException", "JAXBUtils.unmarshalFilterDeploymentPlan()");
+            e.printStackTrace();
+        } catch (ParserConfigurationException e) {
+            Trace.tracePoint("ParserConfigurationException", "JAXBUtils.unmarshalFilterDeploymentPlan()");
+            e.printStackTrace();
+        } catch (SAXException e) {
+            Trace.tracePoint("SAXException", "JAXBUtils.unmarshalFilterDeploymentPlan()");
+            e.printStackTrace();
+        }
+        return null;
+    }
+    
+    private static JAXBContext newJAXBPluginContext() {
+        try {
+            return JAXBContext.newInstance( 
+                    "org.apache.geronimo.system.plugin.model", Activator.class.getClassLoader() );
+        } catch (JAXBException e) {
+            Trace.tracePoint("JAXBException", "JAXBContext.newInstance");
+            e.printStackTrace();
+        }
+        return null;
+    }
+}

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/.classpath
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/.classpath?rev=960742&r1=960741&r2=960742&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/.classpath (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/.classpath Tue Jul  6 01:43:48 2010
@@ -1,26 +1,7 @@
 <?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.
-  -->
-
-<!-- @version $Rev$ $Date$ -->
-
 <classpath>
-    <classpathentry kind="src" path="src/main/java"/>
-    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-    <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-    <classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/META-INF/MANIFEST.MF?rev=960742&r1=960741&r2=960742&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/META-INF/MANIFEST.MF Tue Jul  6 01:43:48 2010
@@ -7,9 +7,10 @@ Bundle-Activator: org.apache.geronimo.st
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: 
- org.apache.geronimo.runtime.v30,
- org.apache.geronimo.jaxbmodel.common,
+ org.apache.geronimo.runtime.common,
  org.apache.geronimo.jee.v21.jaxbmodel,
+ org.apache.geronimo.runtime.v30,
+ org.apache.geronimo.jaxbmodel.common, 
  org.apache.geronimo.st.v30.jaxbmodel, 
  org.eclipse.core.commands,
  org.eclipse.jst.j2ee,

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.jaxbmodel/.classpath
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.jaxbmodel/.classpath?rev=960742&r1=960741&r2=960742&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.jaxbmodel/.classpath (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.jaxbmodel/.classpath Tue Jul  6 01:43:48 2010
@@ -2,8 +2,8 @@
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="src" path="src/test/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="var" path="M2_REPO/xmlunit/xmlunit/1.3/xmlunit-1.3.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.jaxbmodel/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.jaxbmodel/META-INF/MANIFEST.MF?rev=960742&r1=960741&r2=960742&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.jaxbmodel/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.jaxbmodel/META-INF/MANIFEST.MF Tue Jul  6 01:43:48 2010
@@ -3,9 +3,10 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Geronimo V30 JAXB Models
 Bundle-SymbolicName: org.apache.geronimo.st.v30.jaxbmodel;singleton:=true
 Bundle-Version: 3.0.0
-Bundle-ClassPath: .
 Bundle-Vendor: Apache Software Foundation
 Export-Package: 
  org.apache.geronimo.jee.jaspi,
  org.apache.geronimo.osgi.blueprint
 Import-Package: junit.framework;version="3.8.2"
+Require-Bundle: org.apache.geronimo.runtime.common
+Bundle-ActivationPolicy: lazy

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/.classpath
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/.classpath?rev=960742&r1=960741&r2=960742&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/.classpath (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/.classpath Tue Jul  6 01:43:48 2010
@@ -1,26 +1,7 @@
 <?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.
-  -->
-
-<!-- @version $Rev$ $Date$ -->
-
 <classpath>
-    <classpathentry kind="src" path="src/main/java"/>
-    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-    <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-    <classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>



Mime
View raw message