Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 74148 invoked from network); 10 Aug 2008 05:22:48 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 10 Aug 2008 05:22:48 -0000 Received: (qmail 94759 invoked by uid 500); 10 Aug 2008 05:22:47 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 94685 invoked by uid 500); 10 Aug 2008 05:22:47 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 94676 invoked by uid 99); 10 Aug 2008 05:22:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 09 Aug 2008 22:22:47 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 10 Aug 2008 05:21:59 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8B0DB238899E; Sat, 9 Aug 2008 22:22:27 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r684407 - in /geronimo/devtools/eclipse-plugin/trunk: ./ plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/common/ plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/ plugins... Date: Sun, 10 Aug 2008 05:22:26 -0000 To: scm@geronimo.apache.org From: mcconne@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080810052227.8B0DB238899E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mcconne Date: Sat Aug 9 22:22:25 2008 New Revision: 684407 URL: http://svn.apache.org/viewvc?rev=684407&view=rev Log: GERONIMODEVTOOLS-468 Use Java 1.6 internal JAXB implementation instead of JAXB RI for Eclipse plugins Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/test/java/org/apache/geronimo/st/core/internal/NamespacePrefixMapperImpl.java (with props) Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/common/NamespacePrefixMapperImpl.java geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/JAXBUtils.java geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/NamespacePrefixMapperImpl.java geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/test/java/org/apache/geronimo/st/core/internal/DependencyHelperTest.java geronimo/devtools/eclipse-plugin/trunk/pom.xml Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/common/NamespacePrefixMapperImpl.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/common/NamespacePrefixMapperImpl.java?rev=684407&r1=684406&r2=684407&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/common/NamespacePrefixMapperImpl.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/common/NamespacePrefixMapperImpl.java Sat Aug 9 22:22:25 2008 @@ -17,11 +17,11 @@ package org.apache.geronimo.jee.common; +import com.sun.xml.bind.marshaller.NamespacePrefixMapper; + import java.util.HashMap; import java.util.Map; -import com.sun.xml.bind.marshaller.NamespacePrefixMapper; - /** * NamespacePrefixMapperImpl is used to map XML namespaces * to a set of predetermined values. Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/JAXBUtils.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/jaxb/JAXBUtils.java?rev=684407&r1=684406&r2=684407&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/JAXBUtils.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/JAXBUtils.java Sat Aug 9 22:22:25 2008 @@ -72,7 +72,7 @@ marshaller.setListener(marshellerListener); marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true); marshaller.setProperty(Marshaller.JAXB_ENCODING, "UTF-8"); - marshaller.setProperty("com.sun.xml.bind.namespacePrefixMapper", new NamespacePrefixMapperImpl()); + marshaller.setProperty("com.sun.xml.internal.bind.namespacePrefixMapper", new NamespacePrefixMapperImpl()); ByteArrayOutputStream outBuffer = new ByteArrayOutputStream(); marshaller.marshal(jaxbElement, outBuffer); ByteArrayInputStream inBuffer = new ByteArrayInputStream(outBuffer.toByteArray()); Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/NamespacePrefixMapperImpl.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/jaxb/NamespacePrefixMapperImpl.java?rev=684407&r1=684406&r2=684407&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/NamespacePrefixMapperImpl.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/NamespacePrefixMapperImpl.java Sat Aug 9 22:22:25 2008 @@ -17,10 +17,11 @@ package org.apache.geronimo.st.core.jaxb; +import com.sun.xml.internal.bind.marshaller.NamespacePrefixMapper; + import java.util.HashMap; import java.util.Map; -import com.sun.xml.bind.marshaller.NamespacePrefixMapper; import org.apache.geronimo.st.core.internal.Trace; /** Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/test/java/org/apache/geronimo/st/core/internal/DependencyHelperTest.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/test/java/org/apache/geronimo/st/core/internal/DependencyHelperTest.java?rev=684407&r1=684406&r2=684407&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/test/java/org/apache/geronimo/st/core/internal/DependencyHelperTest.java (original) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/test/java/org/apache/geronimo/st/core/internal/DependencyHelperTest.java Sat Aug 9 22:22:25 2008 @@ -33,7 +33,6 @@ import junit.framework.TestCase; -import org.apache.geronimo.st.core.jaxb.NamespacePrefixMapperImpl; import org.xml.sax.InputSource; /** Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/test/java/org/apache/geronimo/st/core/internal/NamespacePrefixMapperImpl.java URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/test/java/org/apache/geronimo/st/core/internal/NamespacePrefixMapperImpl.java?rev=684407&view=auto ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/test/java/org/apache/geronimo/st/core/internal/NamespacePrefixMapperImpl.java (added) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/test/java/org/apache/geronimo/st/core/internal/NamespacePrefixMapperImpl.java Sat Aug 9 22:22:25 2008 @@ -0,0 +1,63 @@ +/** + * 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.core.internal; + +import com.sun.xml.bind.marshaller.NamespacePrefixMapper; + +import java.util.HashMap; +import java.util.Map; + +import org.apache.geronimo.st.core.internal.Trace; + +/** + * NamespacePrefixMapperImpl is used to map XML namespaces + * to a set of predetermined values. + * + * If this class changes, then the test version in org.apache.geronimo.jee.common + * need to be updated to be kept in sync + * + * @version $Rev$ $Date$ + */ +public class NamespacePrefixMapperImpl extends NamespacePrefixMapper { + + private static Map prefixMap = new HashMap(); + + static { + prefixMap.put("http://geronimo.apache.org/xml/ns/deployment-1.2", "dep"); + prefixMap.put("http://geronimo.apache.org/xml/ns/j2ee/application-2.0", "app"); + prefixMap.put("http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0", "client"); + prefixMap.put("http://geronimo.apache.org/xml/ns/j2ee/connector-1.2", "conn"); + prefixMap.put("http://openejb.apache.org/xml/ns/openejb-jar-2.2", "ejb"); + prefixMap.put("http://java.sun.com/xml/ns/persistence", "pers"); + prefixMap.put("http://openejb.apache.org/xml/ns/pkgen-2.1", "pkgen"); + prefixMap.put("http://geronimo.apache.org/xml/ns/naming-1.2", "name"); + prefixMap.put("http://geronimo.apache.org/xml/ns/security-2.0", "sec"); + prefixMap.put("http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1", "web"); + } + + public String getPreferredPrefix(String namespaceUri, String suggestion, boolean requirePrefix) { + Trace.tracePoint("Entry", "NamespacePrefixMapper.getPreferredPrefix", namespaceUri, suggestion, requirePrefix); + + if (prefixMap.containsKey(namespaceUri)) + return prefixMap.get(namespaceUri); + + Trace.tracePoint("Exit", "NamespacePrefixMapper.getPreferredPrefix", namespaceUri, suggestion, requirePrefix); + return suggestion; + } + +} Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/test/java/org/apache/geronimo/st/core/internal/NamespacePrefixMapperImpl.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/test/java/org/apache/geronimo/st/core/internal/NamespacePrefixMapperImpl.java ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/test/java/org/apache/geronimo/st/core/internal/NamespacePrefixMapperImpl.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: geronimo/devtools/eclipse-plugin/trunk/pom.xml URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/pom.xml?rev=684407&r1=684406&r2=684407&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/pom.xml (original) +++ geronimo/devtools/eclipse-plugin/trunk/pom.xml Sat Aug 9 22:22:25 2008 @@ -217,7 +217,6 @@ - org.apache.maven.plugins maven-antrun-plugin @@ -270,7 +269,6 @@ true - @@ -280,10 +278,20 @@ maven-compiler-plugin 2.0.2 - 1.5 - 1.5 + 1.6 + 1.6 + + + ${java.home}/lib/rt.jar + + org.apache.maven.plugins maven-clean-plugin @@ -299,6 +307,7 @@ + org.apache.maven.plugins maven-jar-plugin