geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcco...@apache.org
Subject svn commit: r659123 - in /geronimo/devtools/eclipse-plugin/trunk: ./ features/org.apache.geronimo.feature/ plugins/org.apache.geronimo.runtime.common/ plugins/org.apache.geronimo.runtime.common/META-INF/ plugins/org.apache.geronimo.st.core/src/main/jav...
Date Thu, 22 May 2008 14:26:05 GMT
Author: mcconne
Date: Thu May 22 07:26:04 2008
New Revision: 659123

URL: http://svn.apache.org/viewvc?rev=659123&view=rev
Log:
GERONIMODEVTOOLS-344 Eliminate the usage of xpp3 and xstream in the code, and also deleted
the legal references to them

Modified:
    geronimo/devtools/eclipse-plugin/trunk/LICENSE
    geronimo/devtools/eclipse-plugin/trunk/NOTICE
    geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/feature.properties
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/LICENSE
    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.common/NOTICE
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/ModuleArtifactMapper.java
    geronimo/devtools/eclipse-plugin/trunk/pom.xml

Modified: geronimo/devtools/eclipse-plugin/trunk/LICENSE
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/LICENSE?rev=659123&r1=659122&r2=659123&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/LICENSE (original)
+++ geronimo/devtools/eclipse-plugin/trunk/LICENSE Thu May 22 07:26:04 2008
@@ -268,87 +268,3 @@
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
 POSSIBILITY OF SUCH DAMAGE.
 
-=========================================================================
-==  xpp3 License                                                       ==
-=========================================================================
-
-Indiana University Extreme! Lab Software License
-
-Version 1.1.1
-
-Copyright (c) 2002 Extreme! Lab, Indiana University. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions 
-are met:
-
-1. Redistributions of source code must retain the above copyright notice, 
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright 
-   notice, this list of conditions and the following disclaimer in 
-   the documentation and/or other materials provided with the distribution.
-
-3. The end-user documentation included with the redistribution, if any, 
-   must include the following acknowledgment:
-
-  "This product includes software developed by the Indiana University 
-  Extreme! Lab (http://www.extreme.indiana.edu/)."
-
-Alternately, this acknowledgment may appear in the software itself, 
-if and wherever such third-party acknowledgments normally appear.
-
-4. The names "Indiana Univeristy" and "Indiana Univeristy Extreme! Lab" 
-must not be used to endorse or promote products derived from this 
-software without prior written permission. For written permission, 
-please contact http://www.extreme.indiana.edu/.
-
-5. Products derived from this software may not use "Indiana Univeristy" 
-name nor may "Indiana Univeristy" appear in their name, without prior 
-written permission of the Indiana University.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHORS, COPYRIGHT HOLDERS OR ITS CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-=========================================================================
-==  XStream License                                                    ==
-=========================================================================
-
-Copyright (c) 2003-2006, Joe Walnes
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are 
-met:
-
-Redistributions of source code must retain the above copyright notice, 
-this list of conditions and the following disclaimer. Redistributions in 
-binary form must reproduce the above copyright notice, this list of 
-conditions and the following disclaimer in the documentation and/or other 
-materials provided with the distribution.
-
-Neither the name of XStream nor the names of its contributors may be used 
-to endorse or promote products derived from this software without 
-specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER 
-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-

Modified: geronimo/devtools/eclipse-plugin/trunk/NOTICE
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/NOTICE?rev=659123&r1=659122&r2=659123&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/NOTICE (original)
+++ geronimo/devtools/eclipse-plugin/trunk/NOTICE Thu May 22 07:26:04 2008
@@ -54,18 +54,3 @@
    Copyright 2002 Yuval Oren under the terms of the Apache Software 
    License 2.0
 
-=========================================================================
-==  XPP3 Notice                                                        ==
-=========================================================================
-
-This product includes software developed by the Indiana University 
-  Extreme! Lab (http://www.extreme.indiana.edu/).
-
-Copyright (c) 2002 Extreme! Lab, Indiana University. All rights reserved.
-
-=========================================================================
-==  XStream Notice                                                     ==
-=========================================================================
-
-Copyright (c) 2003-2006, Joe Walnes
-All rights reserved.

Modified: geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/feature.properties
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/feature.properties?rev=659123&r1=659122&r2=659123&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/feature.properties
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/features/org.apache.geronimo.feature/feature.properties
Thu May 22 07:26:04 2008
@@ -196,91 +196,3 @@
       of your accepting any such warranty or additional liability.\n\
 \n\
    END OF TERMS AND CONDITIONS\n\
-\n\
-\n\
-\n\
-====================\n\
-==  xpp3 License  ==\n\
-====================\n\
-\n\
-Indiana University Extreme! Lab Software License\n\
-\n\
-Version 1.1.1\n\
-\n\
-Copyright (c) 2002 Extreme! Lab, Indiana University. All rights reserved.\n\
-\n\
-Redistribution and use in source and binary forms, with or without\n\
-modification, are permitted provided that the following conditions\n\
-are met:\n\
-\n\
-1. Redistributions of source code must retain the above copyright notice,\n\
-   this list of conditions and the following disclaimer.\n\
-\n\
-2. Redistributions in binary form must reproduce the above copyright \n\
-   notice, this list of conditions and the following disclaimer in \n\
-   the documentation and/or other materials provided with the distribution.\n\
-\n\
-3. The end-user documentation included with the redistribution, if any, \n\
-   must include the following acknowledgment:\n\
-\n\
-  "This product includes software developed by the Indiana University \n\
-  Extreme! Lab (http://www.extreme.indiana.edu/)."\n\
-\n\
-Alternately, this acknowledgment may appear in the software itself, \n\
-if and wherever such third-party acknowledgments normally appear.\n\
-\n\
-4. The names "Indiana Univeristy" and "Indiana Univeristy Extreme! Lab" \n\
-must not be used to endorse or promote products derived from this \n\
-software without prior written permission. For written permission, \n\
-please contact http://www.extreme.indiana.edu/.\n\
-\n\
-5. Products derived from this software may not use "Indiana Univeristy" \n\
-name nor may "Indiana Univeristy" appear in their name, without prior \n\
-written permission of the Indiana University.\n\
-\n\
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED\n\
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\n\
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.\n\
-IN NO EVENT SHALL THE AUTHORS, COPYRIGHT HOLDERS OR ITS CONTRIBUTORS\n\
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR\n\
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF\n\
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR\n\
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,\n\
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR\n\
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF\n\
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n\
-\n\
-\n\
-\n\
-=======================\n\
-==  XStream License  ==\n\
-=======================\n\
-\n\
-Copyright (c) 2003-2006, Joe Walnes\n\
-All rights reserved.\n\
-\n\
-Redistribution and use in source and binary forms, with or without\n\
-modification, are permitted provided that the following conditions are \n\
-met:\n\
-\n\
-Redistributions of source code must retain the above copyright notice, \n\
-this list of conditions and the following disclaimer. Redistributions in \n\
-binary form must reproduce the above copyright notice, this list of \n\
-conditions and the following disclaimer in the documentation and/or other \n\
-materials provided with the distribution.\n\
-\n\
-Neither the name of XStream nor the names of its contributors may be used \n\
-to endorse or promote products derived from this software without \n\
-specific prior written permission.\n\
-\n\
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \n\
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT \n\
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A \n\
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER \n\
-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, \n\
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, \n\
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR \n\
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF \n\
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING \n\
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS \n\
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n\

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/LICENSE
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/LICENSE?rev=659123&r1=659122&r2=659123&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/LICENSE
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/LICENSE
Thu May 22 07:26:04 2008
@@ -200,87 +200,3 @@
    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.
-
-=========================================================================
-==  xpp3 License                                                       ==
-=========================================================================
-
-Indiana University Extreme! Lab Software License
-
-Version 1.1.1
-
-Copyright (c) 2002 Extreme! Lab, Indiana University. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions 
-are met:
-
-1. Redistributions of source code must retain the above copyright notice, 
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright 
-   notice, this list of conditions and the following disclaimer in 
-   the documentation and/or other materials provided with the distribution.
-
-3. The end-user documentation included with the redistribution, if any, 
-   must include the following acknowledgment:
-
-  "This product includes software developed by the Indiana University 
-  Extreme! Lab (http://www.extreme.indiana.edu/)."
-
-Alternately, this acknowledgment may appear in the software itself, 
-if and wherever such third-party acknowledgments normally appear.
-
-4. The names "Indiana Univeristy" and "Indiana Univeristy Extreme! Lab" 
-must not be used to endorse or promote products derived from this 
-software without prior written permission. For written permission, 
-please contact http://www.extreme.indiana.edu/.
-
-5. Products derived from this software may not use "Indiana Univeristy" 
-name nor may "Indiana Univeristy" appear in their name, without prior 
-written permission of the Indiana University.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHORS, COPYRIGHT HOLDERS OR ITS CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-=========================================================================
-==  XStream License                                                    ==
-=========================================================================
-
-Copyright (c) 2003-2006, Joe Walnes
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are 
-met:
-
-Redistributions of source code must retain the above copyright notice, 
-this list of conditions and the following disclaimer. Redistributions in 
-binary form must reproduce the above copyright notice, this list of 
-conditions and the following disclaimer in the documentation and/or other 
-materials provided with the distribution.
-
-Neither the name of XStream nor the names of its contributors may be used 
-to endorse or promote products derived from this software without 
-specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A 
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER 
-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

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=659123&r1=659122&r2=659123&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
Thu May 22 07:26:04 2008
@@ -1,96 +1,71 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Geronimo Common Runtime Plug-in
-Bundle-SymbolicName: org.apache.geronimo.runtime.common;singleton:=true
-Bundle-Version: 2.1.1
-Bundle-ClassPath: 
- lib/geronimo-j2ee-deployment_1.1_spec-1.0.jar,
- lib/commons-logging-1.0.4.jar,
- lib/cglib-nodep-2.1_3.jar,
- lib/jaxb-api-2.0.jar,
- lib/jaxb-impl-2.0.5.jar,
- lib/geronimo-stax-api_1.0_spec-1.0.1.jar,
- lib/geronimo-activation_1.1_spec-1.0.2.jar,
- lib/xstream-1.2.2.jar,
- lib/xpp3_min-1.1.3.4.O.jar
-Export-Package: 
- com.sun.istack,
- 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.xmlschema,
- com.sun.xml.bind.v2.util,
- com.sun.xml.txw2,
- com.sun.xml.txw2.annotation,
- com.sun.xml.txw2.output,
- com.thoughtworks.xstream,
- com.thoughtworks.xstream.alias,
- com.thoughtworks.xstream.annotations,
- com.thoughtworks.xstream.converters,
- com.thoughtworks.xstream.converters.basic,
- com.thoughtworks.xstream.converters.collections,
- com.thoughtworks.xstream.converters.enums,
- com.thoughtworks.xstream.converters.extended,
- com.thoughtworks.xstream.converters.javabean,
- com.thoughtworks.xstream.converters.reflection,
- com.thoughtworks.xstream.core,
- com.thoughtworks.xstream.core.util,
- com.thoughtworks.xstream.io,
- com.thoughtworks.xstream.io.binary,
- com.thoughtworks.xstream.io.copy,
- com.thoughtworks.xstream.io.json,
- com.thoughtworks.xstream.io.path,
- com.thoughtworks.xstream.io.xml,
- com.thoughtworks.xstream.io.xml.xppdom,
- com.thoughtworks.xstream.mapper,
- com.thoughtworks.xstream.persistence,
- 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.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.xmlpull.mxp1,
- org.xmlpull.v1
-Bundle-Vendor: Apache.org
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Geronimo Common Runtime Plug-in
+Bundle-SymbolicName: org.apache.geronimo.runtime.common;singleton:=true
+Bundle-Version: 2.1.1
+Bundle-ClassPath: 
+ lib/geronimo-j2ee-deployment_1.1_spec-1.0.jar,
+ lib/commons-logging-1.0.4.jar,
+ lib/cglib-nodep-2.1_3.jar,
+ lib/jaxb-api-2.0.jar,
+ lib/jaxb-impl-2.0.5.jar,
+ lib/geronimo-stax-api_1.0_spec-1.0.1.jar,
+ lib/geronimo-activation_1.1_spec-1.0.2.jar
+Export-Package: 
+ com.sun.istack,
+ 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.xmlschema,
+ com.sun.xml.bind.v2.util,
+ com.sun.xml.txw2,
+ com.sun.xml.txw2.annotation,
+ com.sun.xml.txw2.output,
+ 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.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
+Bundle-Vendor: Apache.org

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/NOTICE
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/NOTICE?rev=659123&r1=659122&r2=659123&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/NOTICE
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/NOTICE
Thu May 22 07:26:04 2008
@@ -30,19 +30,3 @@
  - Piccolo XML Parser for Java from http://piccolo.sourceforge.net/,
    Copyright 2002 Yuval Oren under the terms of the Apache Software 
    License 2.0
-
-=========================================================================
-==  XPP3 Notice                                                        ==
-=========================================================================
-
-This product includes software developed by the Indiana University 
-  Extreme! Lab (http://www.extreme.indiana.edu/).
-
-Copyright (c) 2002 Extreme! Lab, Indiana University. All rights reserved.
-
-=========================================================================
-==  XStream Notice                                                     ==
-=========================================================================
-
-Copyright (c) 2003-2006, Joe Walnes
-All rights reserved.

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml?rev=659123&r1=659122&r2=659123&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml
Thu May 22 07:26:04 2008
@@ -84,14 +84,6 @@
                                     <artifactId>geronimo-stax-api_1.0_spec</artifactId>
                                 </artifactItem>
                                 <artifactItem>
-                                    <groupId>com.thoughtworks.xstream</groupId>
-                                    <artifactId>xstream</artifactId>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>xpp3</groupId>
-                                    <artifactId>xpp3_min</artifactId>
-                                </artifactItem>
-                                <artifactItem>
                                     <groupId>javax.xml.bind</groupId>
                                     <artifactId>jaxb-api</artifactId>
                                 </artifactItem>
@@ -161,14 +153,6 @@
             <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.thoughtworks.xstream</groupId>
-            <artifactId>xstream</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>xpp3</groupId>
-            <artifactId>xpp3_min</artifactId>
-        </dependency>
-        <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
             <exclusions>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/ModuleArtifactMapper.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/ModuleArtifactMapper.java?rev=659123&r1=659122&r2=659123&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/ModuleArtifactMapper.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/ModuleArtifactMapper.java
Thu May 22 07:26:04 2008
@@ -37,8 +37,6 @@
 import org.eclipse.wst.server.core.IServer;
 import org.eclipse.wst.server.core.util.SocketUtil;
 
-import com.thoughtworks.xstream.XStream;
-
 /**
  * @version $Rev$ $Date$
  */
@@ -48,15 +46,12 @@
 
 	private static final String FILE_NAME = "servermodule.info";
 
-	HashMap serverEntries;
-
-	XStream xStream;
+	ServerEntries serverEntries = null;
 
 	private ModuleArtifactMapper() {
-		xStream = new XStream();
-		load();
 		if (serverEntries == null)
-			serverEntries = new HashMap();
+			serverEntries = new ServerEntries();
+		load();
 	}
 
 	public static ModuleArtifactMapper getInstance() {
@@ -77,7 +72,7 @@
 
 		artifactEntries.put(project.getName(), configId);
 	}
-	
+
 	public void removeEntry(IServer server, IProject project) {
 
 		if (!SocketUtil.isLocalhost(server.getHost()))
@@ -89,7 +84,7 @@
 			artifactEntries.remove(project.getName());
 		}
 	}
-	
+
 	public String resolve(IServer server, IModule module) {
 		Map artifactEntries = (Map) serverEntries.get(server.getRuntime().getLocation().toFile());
 		if (artifactEntries != null) {
@@ -105,7 +100,7 @@
 			OutputStream file = new FileOutputStream(dest.toFile());
 			OutputStream buffer = new BufferedOutputStream(file);
 			output = new ObjectOutputStream(buffer);
-			String xml = xStream.toXML(serverEntries);
+			String xml = serverEntries.toXML();
 			output.writeObject(xml);
 		} catch (IOException e) {
 			e.printStackTrace();
@@ -128,7 +123,7 @@
 				InputStream buffer = new BufferedInputStream(file);
 				input = new ObjectInputStream(buffer);
 				String xml = (String) input.readObject();
-				serverEntries = (HashMap) xStream.fromXML(xml);
+				serverEntries.loadXML(xml);
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -141,4 +136,81 @@
 			}
 		}
 	}
+
+	// This Inner class is the result of removing XStream.  ModuleArtifactMapper
+	// was the only class using it so it seemed silly to have two extra jar
+	// files (xpp3.jar and xstream.jar) just for one class.
+	// this class is a HashMap
+	// keys are the files
+	// entries are the Maps of artifact entries
+	// this is all saved/loaded to .plugins/org.apache.geronimo.st.core/servermodule.info
+    protected class ServerEntries extends HashMap {
+        static final long serialVersionUID = 0;
+
+        protected void loadXML (String xml) {
+            if (xml == null || xml.length() == 0)
+                return;
+
+            String projectName, configId;
+            int fileEndPos, nomapStartPos, mapStartPos, mapEndPos, stringStartPos, stringEndPos;
+            int fileStartPos = xml.indexOf("<file>", 0);
+            Map artifactEntries;
+            while (fileStartPos > -1) {
+                fileEndPos = xml.indexOf("</file>", fileStartPos);
+                File runtimeLoc = new File(xml.substring(fileStartPos + 6, fileEndPos));
+
+                nomapStartPos = xml.indexOf("<map/>", fileEndPos);
+                mapStartPos = xml.indexOf("<map>", fileEndPos);
+                artifactEntries = new HashMap();
+                // have projects on the server
+                if ((nomapStartPos == -1) || (nomapStartPos > mapStartPos)) {
+                    mapEndPos = xml.indexOf("</map>", mapStartPos);
+                    stringStartPos = xml.indexOf("<string>", mapStartPos);
+                    while ((stringStartPos > -1) && (stringStartPos < mapEndPos))
{
+                        stringEndPos = xml.indexOf("</string>", stringStartPos);
+                        projectName = xml.substring(stringStartPos + 8, stringEndPos);
+                        stringStartPos = xml.indexOf("<string>", stringEndPos);
+                        stringEndPos = xml.indexOf("</string>", stringStartPos);
+                        configId = xml.substring(stringStartPos + 8, stringEndPos);
+                        artifactEntries.put(projectName, configId);
+                        stringStartPos = xml.indexOf("<string>", stringEndPos);
+                    }
+                }
+                // if no projects on the server, it is ok to put an empty HashMap
+                this.put (runtimeLoc, artifactEntries);
+
+                fileStartPos = xml.indexOf("<file>", fileEndPos);
+            }
+        }
+
+        protected String toXML () {
+            String xmlString = "";
+            if (!isEmpty()) {
+                xmlString = "<map>\n  <entry>\n";
+
+                Object[] serverKeySet = keySet().toArray();
+                for (int i = 0; i < serverKeySet.length; i++) {
+                    xmlString += "    <file>" + serverKeySet[i] + "</file>\n";
+                    Map projectMap = (Map)get(serverKeySet[i]);
+                    if (projectMap == null || projectMap.size() == 0) {
+                        xmlString += "    <map/>\n";
+                    }
+                    else {
+                        xmlString += "    <map>\n";
+                        Object[] projectKeySet = projectMap.keySet().toArray();
+                        for (int j = 0; j < projectKeySet.length; j++)
+                        {
+                             xmlString += "      <entry>\n";
+                             xmlString += "        <string>" + (String)projectKeySet[j]
+ "</string>\n";
+                             xmlString += "        <string>" + (String)projectMap.get(projectKeySet[j])
+ "</string>\n";
+                             xmlString += "      </entry>\n";
+                        }
+                        xmlString += "    </map>\n";
+                    }
+                }
+                xmlString += "  </entry>\n</map>";
+            }
+            return xmlString;
+        }
+    }
 }

Modified: geronimo/devtools/eclipse-plugin/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/pom.xml?rev=659123&r1=659122&r2=659123&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/pom.xml Thu May 22 07:26:04 2008
@@ -95,18 +95,6 @@
         <dependencies>
                         
             <dependency>
-                <groupId>com.thoughtworks.xstream</groupId>
-                <artifactId>xstream</artifactId>
-                <version>1.2.2</version>
-            </dependency>
-                        
-            <dependency>
-                <groupId>xpp3</groupId>
-                <artifactId>xpp3_min</artifactId>
-                <version>1.1.3.4.O</version>
-            </dependency>
-                        
-            <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
                 <version>3.8.1</version>



Mime
View raw message