[INFO] ------------------------------------------------------------------------
[INFO] Building org.apache.geronimo.jee.v21.jaxbmodel [INFO] task-segment: [clean, install][INFO] ------------------------------------------------------------------------
[INFO] [clean:clean][INFO] Deleting directory /Users/drwoods/geronimo/devtools-eclipse-plugin-trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/target [INFO] Deleting file-set: /Users/drwoods/geronimo/devtools-eclipse-plugin-trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel (included: [.settings], excluded: [])
[INFO] [buildnumber:create {execution: default}]
[INFO] Storing buildNumber: 20080812175051 at timestamp: 1218577851107
[INFO] [resources:resources]
[INFO] Using default encoding to copy filtered resources.
[INFO] [compiler:compile]
[INFO] Compiling 116 source files to
/Users/drwoods/geronimo/devtools-eclipse-plugin-trunk/plugins/org.apache.geronimo.jee.v21.jaxbmodel/target/classes
[INFO]
------------------------------------------------------------------------
[ERROR] BUILD FAILURE[INFO] ------------------------------------------------------------------------
[INFO] Compilation failure Failure executing javac, but could not parse the error: Fatal Error: Unable to find package java.lang in classpath or bootclasspath
Failure executing javac, but could not parse the error: Fatal Error: Unable to find package java.lang in classpath or bootclasspath[INFO] ------------------------------------------------------------------------
[INFO] For more information, run Maven with the -e switch[INFO] ------------------------------------------------------------------------
[INFO] Total time: 15 seconds [INFO] Finished at: Tue Aug 12 17:50:51 EDT 2008 [INFO] Final Memory: 15M/63M[INFO] ------------------------------------------------------------------------
[EMAIL PROTECTED] wrote:
Author: mcconne Date: Tue Aug 12 14:30:54 2008 New Revision: 685324 URL: http://svn.apache.org/viewvc?rev=685324&view=rev Log: GERONIMODEVTOOLS-468 Support Java 1.6 internal JAXB implementation and Java 1.5 JAXB RI implementation Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/NamespacePrefixMapperImpl6.java (with props) Modified: 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/pom.xml geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/META-INF/MANIFEST.MF 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=685324&r1=685323&r2=685324&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 Tue Aug 12 14:30:54 2008 @@ -72,7 +72,13 @@ 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()); + Trace.tracePoint("JAXBUtils", "JAXBUtils.marshalDeploymentPlan()", System.getProperty("java.runtime.version")); + if ( System.getProperty("java.runtime.version").startsWith("1.6") ) { + marshaller.setProperty("com.sun.xml.internal.bind.namespacePrefixMapper", new NamespacePrefixMapperImpl6()); + } + else { + marshaller.setProperty("com.sun.xml.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=685324&r1=685323&r2=685324&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 Tue Aug 12 14:30:54 2008 @@ -24,11 +24,12 @@ import org.apache.geronimo.st.core.internal.Trace;/** - * <strong>NamespacePrefixMapperImpl</strong> is used to map XML namespaces - * to a set of predetermined values. + * <strong>NamespacePrefixMapperImpl</strong> is used to map XML namespaces to a set of + * predetermined values for a Jave 1.5 runtime, which uses the reference implementation (RI) JAXB + * implementation. * * If this class changes, then the test version in org.apache.geronimo.jee.common- * need to be updated to be kept in sync + * needs to be updated to be kept in sync, as well as the Java 1.6 runtime version* * @version $Rev$ $Date$*/ @@ -50,12 +51,12 @@ }public String getPreferredPrefix(String namespaceUri, String suggestion, boolean requirePrefix) {- Trace.tracePoint("Entry", "NamespacePrefixMapper.getPreferredPrefix", namespaceUri, suggestion, requirePrefix); + Trace.tracePoint("Entry", "NamespacePrefixMapperImpl.getPreferredPrefix", namespaceUri, suggestion, requirePrefix);if (prefixMap.containsKey(namespaceUri))return prefixMap.get(namespaceUri);- Trace.tracePoint("Exit", "NamespacePrefixMapper.getPreferredPrefix", namespaceUri, suggestion, requirePrefix);+ Trace.tracePoint("Exit", "NamespacePrefixMapperImpl.getPreferredPrefix", namespaceUri, suggestion, requirePrefix); return suggestion; }Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/NamespacePrefixMapperImpl6.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/NamespacePrefixMapperImpl6.java?rev=685324&view=auto ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/NamespacePrefixMapperImpl6.java (added) +++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/NamespacePrefixMapperImpl6.java Tue Aug 12 14:30:54 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.jaxb; + +import java.util.HashMap; +import java.util.Map; + +import com.sun.xml.internal.bind.marshaller.NamespacePrefixMapper; +import org.apache.geronimo.st.core.internal.Trace; + +/**+ * <strong>NamespacePrefixMapperImpl6</strong> is used to map XML namespaces + * to a set of predetermined values for a Jave 1.6 runtime, which uses the internal JAXB + * implementation. + * + * If this class changes, then the test version in org.apache.geronimo.jee.common+ * needs to be updated to be kept in sync, as well as the Java 1.5 runtime version+ * + * @version $Rev$ $Date$ + */+public class NamespacePrefixMapperImpl6 extends NamespacePrefixMapper { + + private static Map<String, String> prefixMap = new HashMap<String, String>(); + + 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", "NamespacePrefixMapperImpl6.getPreferredPrefix", namespaceUri, suggestion, requirePrefix); + + if (prefixMap.containsKey(namespaceUri)) + return prefixMap.get(namespaceUri); + + Trace.tracePoint("Exit", "NamespacePrefixMapperImpl6.getPreferredPrefix", namespaceUri, suggestion, requirePrefix); + return suggestion; + }+ +}Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/NamespacePrefixMapperImpl6.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/NamespacePrefixMapperImpl6.java ------------------------------------------------------------------------------ svn:keywords = Date Revision Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/main/java/org/apache/geronimo/st/core/jaxb/NamespacePrefixMapperImpl6.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=685324&r1=685323&r2=685324&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/pom.xml (original) +++ geronimo/devtools/eclipse-plugin/trunk/pom.xml Tue Aug 12 14:30:54 2008 @@ -288,6 +288,23 @@ <configuration> <source>1.5</source> <target>1.5</target> + <!-- + | + | If using a JDK 1.6 this entry will point to the rt.jar without any changes. + | For example: + | + | <bootclasspath>${java.home}/lib/rt.jar</bootclasspath> + |+ | If using a JDK 1.5 this entry must be modified to point to a 1.6 rt.jar + | on your system, which means it must be either manually downloaded or + | installed. For example:+ | + | <bootclasspath>C:/Program Files/Java/jre1.6.0_07/lib/rt.jar</bootclasspath> + | + --> + <compilerArguments> + <bootclasspath>${java.home}/lib/rt.jar</bootclasspath> + </compilerArguments> </configuration> </plugin> <plugin> Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/META-INF/MANIFEST.MF URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/META-INF/MANIFEST.MF?rev=685324&r1=685323&r2=685324&view=diff ============================================================================== --- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/META-INF/MANIFEST.MF (original) +++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/META-INF/MANIFEST.MF Tue Aug 12 14:30:54 2008 @@ -5,8 +5,8 @@ Bundle-Version: 2.1.2 Bundle-Vendor: Apache.org Bundle-Localization: plugin -Require-Bundle: abbot.swt, - abbot.swt.eclipse, +Require-Bundle: abbot.swt;resolution:=optional, + abbot.swt.eclipse;resolution:=optional, org.eclipse.core.runtime, org.eclipse.debug.ui, org.eclipse.debug.core,
smime.p7s
Description: S/MIME Cryptographic Signature
