You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2008/10/26 10:44:20 UTC
svn commit: r707961 - in /tuscany/branches/sca-equinox: ./
distribution/repository/ tools/maven/ tools/maven/maven-eclipse-compiler/
tools/maven/maven-eclipse-compiler/src/
tools/maven/maven-eclipse-compiler/src/main/
tools/maven/maven-eclipse-compiler...
Author: jsdelfino
Date: Sun Oct 26 02:44:19 2008
New Revision: 707961
URL: http://svn.apache.org/viewvc?rev=707961&view=rev
Log:
Attempt to use the Eclipse compiler to compile modules, this will allow OSGi imports/exports to be used at compile time.
Added:
tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/
tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/LICENSE
tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/NOTICE
tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/pom.xml
tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/
tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/
tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/
tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/
tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/
tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/
tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/
tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/
tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/
tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/
tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/ClassLoaderNameEnvironment.java
tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/CompilerRequestor.java
tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/FileCompilationUnit.java
tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/JavaCompiler.java
tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/resources/
tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/resources/META-INF/
tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/resources/META-INF/plexus/
tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/resources/META-INF/plexus/components.xml
Modified:
tuscany/branches/sca-equinox/distribution/repository/pom.xml
tuscany/branches/sca-equinox/pom.xml
tuscany/branches/sca-equinox/tools/maven/pom.xml
Modified: tuscany/branches/sca-equinox/distribution/repository/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/distribution/repository/pom.xml?rev=707961&r1=707960&r2=707961&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/distribution/repository/pom.xml (original)
+++ tuscany/branches/sca-equinox/distribution/repository/pom.xml Sun Oct 26 02:44:19 2008
@@ -60,6 +60,11 @@
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-maven-eclipse-compiler</artifactId>
+ <version>1.4-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-maven-incremental-build</artifactId>
<version>1.4-SNAPSHOT</version>
</dependency>
Modified: tuscany/branches/sca-equinox/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/pom.xml?rev=707961&r1=707960&r2=707961&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/pom.xml (original)
+++ tuscany/branches/sca-equinox/pom.xml Sun Oct 26 02:44:19 2008
@@ -340,7 +340,6 @@
</profile>
</profiles>
-
<build>
<defaultGoal>install</defaultGoal>
@@ -368,18 +367,18 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version>
<configuration>
-<!-- <compilerId>eclipse</compilerId> -->
+ <compilerId>tuscany-eclipse</compilerId>
<source>1.5</source>
<target>1.5</target>
</configuration>
-<!--
+
<dependencies>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-compiler-eclipse</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-maven-eclipse-compiler</artifactId>
+ <version>1.4-SNAPSHOT</version>
</dependency>
</dependencies>
--->
</plugin>
<!-- surefire plugin configuration -->
Added: tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/LICENSE
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/LICENSE?rev=707961&view=auto
==============================================================================
--- tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/LICENSE (added)
+++ tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/LICENSE Sun Oct 26 02:44:19 2008
@@ -0,0 +1,205 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
+
+
+
Added: tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/NOTICE
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/NOTICE?rev=707961&view=auto
==============================================================================
--- tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/NOTICE (added)
+++ tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/NOTICE Sun Oct 26 02:44:19 2008
@@ -0,0 +1,6 @@
+${pom.name}
+Copyright (c) 2005 - 2008 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
Added: tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/pom.xml?rev=707961&view=auto
==============================================================================
--- tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/pom.xml (added)
+++ tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/pom.xml Sun Oct 26 02:44:19 2008
@@ -0,0 +1,160 @@
+<?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.
+-->
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>4</version>
+ </parent>
+
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-maven-eclipse-compiler</artifactId>
+ <packaging>jar</packaging>
+ <name>Apache Tuscany SCA Eclipse Compiler Plugin</name>
+ <version>1.4-SNAPSHOT</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.0.7</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>2.0.7</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-settings</artifactId>
+ <version>2.0.7</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>2.0.7</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ <version>2.0.7</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-compiler-api</artifactId>
+ <version>1.5.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.jdt</groupId>
+ <artifactId>core</artifactId>
+ <version>3.3.0-v_771</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>common</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>app</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>app</artifactId>
+ <version>1.0.0-v20070606</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>common</artifactId>
+ <version>3.3.0-v20070426</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <defaultGoal>install</defaultGoal>
+
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${notice.dir}</directory>
+ <targetPath>META-INF</targetPath>
+ <filtering>true</filtering>
+ <includes>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ </includes>
+ </resource>
+ </resources>
+
+ <pluginManagement>
+ <plugins>
+
+ <!-- compiler plugin configuration -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+
+ <!-- jar plugin configuration -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Extension-Name>${project.artifactId}</Extension-Name>
+ <Specification-Title>${name}</Specification-Title>
+ <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
+ <Specification-Version>${version}</Specification-Version>
+ <Implementation-Title>${name}</Implementation-Title>
+ <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+ <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
+ <Implementation-Version>${version}</Implementation-Version>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </pluginManagement>
+ </build>
+
+</project>
Added: tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/ClassLoaderNameEnvironment.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/ClassLoaderNameEnvironment.java?rev=707961&view=auto
==============================================================================
--- tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/ClassLoaderNameEnvironment.java (added)
+++ tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/ClassLoaderNameEnvironment.java Sun Oct 26 02:44:19 2008
@@ -0,0 +1,195 @@
+/*
+ * 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.tuscany.sca.tools.maven.compiler;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.jdt.internal.compiler.classfmt.ClassFileReader;
+import org.eclipse.jdt.internal.compiler.classfmt.ClassFormatException;
+import org.eclipse.jdt.internal.compiler.env.ICompilationUnit;
+import org.eclipse.jdt.internal.compiler.env.INameEnvironment;
+import org.eclipse.jdt.internal.compiler.env.NameEnvironmentAnswer;
+
+/**
+ * An implementation of INameEnvironment based on a ClassLoader.
+ *
+ * @version $Rev: $ $Date: $
+ */
+class ClassLoaderNameEnvironment implements INameEnvironment {
+ private final static char fileSeparator = System.getProperty("file.separator").charAt(0);
+
+ private ClassLoader classLoader;
+ private List<String> sourceLocations;
+ private Map<String, File> sourceFiles;
+
+ ClassLoaderNameEnvironment(ClassLoader classLoader, List<String> sourceLocations) {
+ this.classLoader = classLoader;
+ this.sourceLocations = sourceLocations;
+ sourceFiles = new HashMap<String, File>();
+ }
+
+ public NameEnvironmentAnswer findType(char[][] compoundTypeName) {
+ StringBuffer className = new StringBuffer();
+ for (char[] name: compoundTypeName) {
+ if (className.length() != 0) {
+ className.append('.');
+ }
+ className.append(name);
+ }
+ return nameAnswer(className.toString());
+ }
+
+ public NameEnvironmentAnswer findType(char[] typeName, char[][] packageName) {
+ StringBuffer className = new StringBuffer();
+ for (char[] name: packageName) {
+ if (className.length() != 0) {
+ className.append('.');
+ }
+ className.append(name);
+ }
+ if (className.length() != 0) {
+ className.append('.');
+ }
+ className.append(typeName);
+ return nameAnswer(className.toString());
+ }
+
+ public boolean isPackage(char[][] parentPackageName, char[] packageName) {
+ StringBuffer fullPackageName = new StringBuffer();
+ if (parentPackageName != null) {
+ for (char[] name: parentPackageName) {
+ if (fullPackageName.length() != 0) {
+ fullPackageName.append('.');
+ }
+ fullPackageName.append(name);
+ }
+ }
+ if (fullPackageName.length() != 0) {
+ fullPackageName.append('.');
+ }
+ fullPackageName.append(packageName);
+ return isPackage(fullPackageName.toString());
+ }
+
+ public void cleanup() {
+ }
+
+ /**
+ * Returns the source file for the given class name.
+ *
+ * @param className
+ * @return
+ */
+ private File sourceFile(String className) {
+ File sourceFile = (File)sourceFiles.get(className);
+ if (sourceFile != null) {
+ return sourceFile;
+ }
+ String sourceName = className.replace('.', fileSeparator) + ".java";
+ sourceFile = sourceFileInSourceLocations(sourceName);
+ sourceFiles.put(className, sourceFile);
+ return sourceFile;
+ }
+
+ /**
+ * Returns the source file for the given source path relative to the source locations.
+ *
+ * @param className
+ * @return
+ */
+ private File sourceFileInSourceLocations(String relativePath) {
+ for (String sourceLocation : sourceLocations) {
+ File sourceFile = new File(sourceLocation, relativePath);
+ if (sourceFile.exists()) {
+ return sourceFile;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Returns true if the given name is a package name.
+ *
+ * @param name
+ * @return
+ */
+ private boolean isPackage(String name) {
+ if (sourceFile(name) != null) {
+ return false;
+ }
+ String resourceName = '/' + name.replace('.', '/') + ".class";
+ InputStream is = classLoader.getResourceAsStream(resourceName);
+ if (is == null) {
+ return true;
+ } else {
+ try {
+ is.close();
+ } catch (IOException e) {}
+ return false;
+ }
+ }
+
+ /**
+ * Find the NameAnswer for by the given class name.
+ *
+ * @param className
+ * @return
+ */
+ private NameEnvironmentAnswer nameAnswer(String className) {
+ try {
+ File sourceFile = sourceFile(className);
+ if (sourceFile != null) {
+ ICompilationUnit compilationUnit = new FileCompilationUnit(sourceFile.getAbsolutePath(), className);
+ return new NameEnvironmentAnswer(compilationUnit, null);
+ }
+
+ String resourceName = className.replace('.', '/') + ".class";
+ InputStream is = classLoader.getResourceAsStream(resourceName);
+ if (is == null) {
+ return null;
+ }
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ byte[] b = new byte[2048];
+ for (;;) {
+ int n = is.read(b);
+ if (n <= 0) {
+ break;
+ }
+ bos.write(b, 0, n);
+ }
+ byte[] classBytes = bos.toByteArray();
+
+ ClassFileReader classFileReader = new ClassFileReader(classBytes, className.toCharArray(), true);
+ return new NameEnvironmentAnswer(classFileReader, null);
+
+ } catch (IOException e) {
+ throw new IllegalArgumentException(e);
+ } catch (ClassFormatException e) {
+ throw new IllegalArgumentException(e);
+ }
+ }
+
+}
Added: tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/CompilerRequestor.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/CompilerRequestor.java?rev=707961&view=auto
==============================================================================
--- tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/CompilerRequestor.java (added)
+++ tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/CompilerRequestor.java Sun Oct 26 02:44:19 2008
@@ -0,0 +1,110 @@
+/*
+ * 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.tuscany.sca.tools.maven.compiler;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.List;
+
+import org.codehaus.plexus.compiler.CompilerError;
+import org.eclipse.jdt.core.compiler.IProblem;
+import org.eclipse.jdt.internal.compiler.ClassFile;
+import org.eclipse.jdt.internal.compiler.CompilationResult;
+import org.eclipse.jdt.internal.compiler.ICompilerRequestor;
+
+class CompilerRequestor implements ICompilerRequestor {
+ private String outputDirectory;
+ private List<CompilerError> compilerErrors;
+
+ public CompilerRequestor(String outputDirectory, List<CompilerError> compilerErrors) {
+ this.outputDirectory = outputDirectory;
+ this.compilerErrors = compilerErrors;
+ }
+
+ public void acceptResult(CompilationResult result) {
+ boolean hasErrors = false;
+ if (result.hasProblems()) {
+
+ // Convert JDT IProblems into plexus CompilerErrors
+ for (IProblem problem: result.getProblems()) {
+ if (problem.isWarning()) {
+ compilerErrors.add(new CompilerError(new String(problem.getOriginatingFileName()),
+ false,
+ problem.getSourceLineNumber(),
+ problem.getSourceStart(),
+ problem.getSourceLineNumber(),
+ problem.getSourceEnd(),
+ problem.getMessage()));
+
+ } else if (problem.isError()) {
+ hasErrors = true;
+ compilerErrors.add(new CompilerError(new String(problem.getOriginatingFileName()),
+ true,
+ problem.getSourceLineNumber(),
+ problem.getSourceStart(),
+ problem.getSourceLineNumber(),
+ problem.getSourceEnd(),
+ problem.getMessage()));
+
+ }
+ }
+ }
+
+ // Write the class files
+ if (!hasErrors) {
+ ClassFile[] classFiles = result.getClassFiles();
+ for (ClassFile classFile: classFiles) {
+
+ // Create file and parent directories
+ StringBuffer className = new StringBuffer();
+ for (char[] name: classFile.getCompoundName()) {
+ if (className.length() != 0) {
+ className.append('.');
+ }
+ className.append(name);
+ }
+ File file = new File(outputDirectory, className.toString().replace('.', '/') + ".class");
+ if (!file.getParentFile().exists()) {
+ file.getParentFile().mkdirs();
+ }
+
+ // Write class file contents
+ FileOutputStream fos = null;
+ try {
+ fos = new FileOutputStream(file);
+ fos.write(classFile.getBytes());
+ } catch (FileNotFoundException e) {
+ throw new IllegalArgumentException(e);
+ } catch (IOException e) {
+ throw new IllegalArgumentException(e);
+ } finally {
+ if (fos != null) {
+ try {
+ fos.close();
+ } catch (IOException e) {}
+ }
+ }
+ }
+ }
+ }
+
+}
\ No newline at end of file
Added: tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/FileCompilationUnit.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/FileCompilationUnit.java?rev=707961&view=auto
==============================================================================
--- tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/FileCompilationUnit.java (added)
+++ tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/FileCompilationUnit.java Sun Oct 26 02:44:19 2008
@@ -0,0 +1,87 @@
+/*
+ * 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.tuscany.sca.tools.maven.compiler;
+
+import java.io.CharArrayWriter;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.StringTokenizer;
+
+import org.eclipse.jdt.internal.compiler.env.ICompilationUnit;
+
+/**
+ * An implementation of ICompilationUnit that wraps a File.
+ *
+ * @version $Rev: $ $Date: $
+ */
+class FileCompilationUnit implements ICompilationUnit {
+ private String className;
+ private String sourceFile;
+
+ FileCompilationUnit(String sourceFile, String className) {
+ this.className = className;
+ this.sourceFile = sourceFile;
+ }
+
+ public char[] getContents() {
+ try {
+ InputStreamReader reader = new InputStreamReader(new FileInputStream(sourceFile));
+ CharArrayWriter writer = new CharArrayWriter();
+ char[] b = new char[2048];
+ for (;;) {
+ int n = reader.read(b);
+ if (n <= 0) {
+ break;
+ }
+ writer.write(b, 0, n);
+ }
+ return writer.toCharArray();
+
+ } catch (FileNotFoundException e) {
+ throw new IllegalArgumentException(e);
+ } catch (IOException e) {
+ throw new IllegalArgumentException(e);
+ }
+ }
+
+ public char[] getFileName() {
+ return sourceFile.toCharArray();
+ }
+
+ public char[] getMainTypeName() {
+ int dot = className.lastIndexOf('.');
+ if (dot > 0) {
+ return className.substring(dot + 1).toCharArray();
+ }
+ return className.toCharArray();
+ }
+
+ public char[][] getPackageName() {
+ StringTokenizer tokens = new StringTokenizer(className, ".");
+ char[][] packageName = new char[tokens.countTokens() - 1][];
+ for (int i = 0; i < packageName.length; i++) {
+ String token = tokens.nextToken();
+ packageName[i] = token.toCharArray();
+ }
+ return packageName;
+ }
+}
\ No newline at end of file
Added: tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/JavaCompiler.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/JavaCompiler.java?rev=707961&view=auto
==============================================================================
--- tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/JavaCompiler.java (added)
+++ tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/JavaCompiler.java Sun Oct 26 02:44:19 2008
@@ -0,0 +1,167 @@
+/*
+ * 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.tuscany.sca.tools.maven.compiler;
+
+import static org.codehaus.plexus.compiler.CompilerOutputStyle.ONE_OUTPUT_FILE_PER_INPUT_FILE;
+import static org.eclipse.jdt.internal.compiler.DefaultErrorHandlingPolicies.proceedWithAllProblems;
+import static org.eclipse.jdt.internal.compiler.impl.CompilerOptions.DISABLED;
+import static org.eclipse.jdt.internal.compiler.impl.CompilerOptions.GENERATE;
+import static org.eclipse.jdt.internal.compiler.impl.CompilerOptions.IGNORE;
+import static org.eclipse.jdt.internal.compiler.impl.CompilerOptions.OPTION_Encoding;
+import static org.eclipse.jdt.internal.compiler.impl.CompilerOptions.OPTION_LineNumberAttribute;
+import static org.eclipse.jdt.internal.compiler.impl.CompilerOptions.OPTION_LocalVariableAttribute;
+import static org.eclipse.jdt.internal.compiler.impl.CompilerOptions.OPTION_ReportDeprecation;
+import static org.eclipse.jdt.internal.compiler.impl.CompilerOptions.OPTION_Source;
+import static org.eclipse.jdt.internal.compiler.impl.CompilerOptions.OPTION_SourceFileAttribute;
+import static org.eclipse.jdt.internal.compiler.impl.CompilerOptions.OPTION_SuppressWarnings;
+import static org.eclipse.jdt.internal.compiler.impl.CompilerOptions.OPTION_TargetPlatform;
+import static org.eclipse.jdt.internal.compiler.impl.CompilerOptions.WARNING;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+
+import org.codehaus.plexus.compiler.AbstractCompiler;
+import org.codehaus.plexus.compiler.CompilerConfiguration;
+import org.codehaus.plexus.compiler.CompilerError;
+import org.codehaus.plexus.compiler.CompilerException;
+import org.eclipse.jdt.internal.compiler.Compiler;
+import org.eclipse.jdt.internal.compiler.ICompilerRequestor;
+import org.eclipse.jdt.internal.compiler.env.ICompilationUnit;
+import org.eclipse.jdt.internal.compiler.env.INameEnvironment;
+import org.eclipse.jdt.internal.compiler.problem.DefaultProblemFactory;
+
+/**
+ * A custom Plexus Java compiler plugin that uses the Eclipse compiler.
+ *
+ * @version $Rev: $ $Date: $
+ */
+public class JavaCompiler extends AbstractCompiler {
+
+ public JavaCompiler() {
+ super(ONE_OUTPUT_FILE_PER_INPUT_FILE, ".java", ".class", null);
+ }
+
+ public List<CompilerError> compile(CompilerConfiguration configuration) throws CompilerException {
+
+ getLogger().info("Tuscany-Eclipse compiler");
+
+ List<URL> urls;
+ try {
+ urls = new ArrayList<URL>();
+ urls.add(new File(configuration.getOutputLocation()).toURI().toURL());
+ for (String entry: (List<String>)configuration.getClasspathEntries()) {
+ urls.add(new File(entry).toURI().toURL());
+ }
+ } catch (MalformedURLException e) {
+ throw new CompilerException(e.getMessage(), e);
+ }
+
+ ClassLoader classLoader = new URLClassLoader(urls.toArray(new URL[urls.size()]));
+
+ // Determine compiler configuration
+ Map<String, String> settings = new HashMap<String, String>();
+ String sourceVersion = configuration.getSourceVersion();
+ if (sourceVersion != null && sourceVersion.length() != 0) {
+ settings.put(OPTION_Source, sourceVersion);
+ }
+ String targetVersion = configuration.getTargetVersion();
+ if (targetVersion != null && targetVersion.length() != 0) {
+ settings.put(OPTION_TargetPlatform, targetVersion);
+ }
+ settings.put(OPTION_LineNumberAttribute, GENERATE);
+ settings.put(OPTION_SourceFileAttribute, GENERATE);
+ if (configuration.isDebug()) {
+ settings.put(OPTION_LocalVariableAttribute, GENERATE);
+ }
+ if (configuration.getSourceEncoding() != null && !configuration.getSourceEncoding().isEmpty()) {
+ settings.put(OPTION_Encoding, configuration.getSourceEncoding());
+ }
+ if (!configuration.isShowWarnings()) {
+ settings.put(OPTION_SuppressWarnings, DISABLED);
+ }
+ if (configuration.isShowDeprecation()) {
+ settings.put(OPTION_ReportDeprecation, WARNING);
+ } else {
+ settings.put(OPTION_ReportDeprecation, IGNORE);
+ }
+
+ // Create a compiler
+ List<CompilerError> compilerErrors = new ArrayList<CompilerError>();
+ INameEnvironment nameEnvironment = new ClassLoaderNameEnvironment(classLoader, configuration.getSourceLocations());
+ ICompilerRequestor requestor = new CompilerRequestor(configuration.getOutputLocation(), compilerErrors);
+ Compiler compiler = new Compiler(nameEnvironment,
+ proceedWithAllProblems(),
+ settings,
+ requestor,
+ new DefaultProblemFactory(Locale.getDefault()));
+
+ // Create compilation units for the source files
+ List<FileCompilationUnit> compilationUnits = new ArrayList<FileCompilationUnit>();
+
+ // Go over the input source locations
+ List<String> sourceLocations = (List<String>)configuration.getSourceLocations();
+ for (String sourceLocation : sourceLocations) {
+
+ // Exclude nested source locations
+ List<String> excludeLocations = new ArrayList<String>();
+ for (String nestedLocation : sourceLocations) {
+ if (nestedLocation != sourceLocation && nestedLocation.startsWith(sourceLocation)) {
+ excludeLocations.add(nestedLocation);
+ }
+ }
+
+ // List source files in each source location
+ for (String sourceFile: (Set<String>)getSourceFilesForSourceRoot(configuration, sourceLocation)) {
+
+ // Exclude files from excluded nested locations
+ boolean excluded = false;
+ for (String excludeLocation: excludeLocations) {
+ if (sourceFile.startsWith(excludeLocation)) {
+ excluded = true;
+ }
+ }
+ if (!excluded) {
+
+ // Create a compilation unit for the source file
+ FileCompilationUnit compilationUnit = new FileCompilationUnit(sourceFile, makeClassName(sourceFile, sourceLocation));
+ compilationUnits.add(compilationUnit);
+ }
+ }
+ }
+
+ // Compile all the compilation units
+ getLogger().info("Compiling " + compilationUnits.size() + " to " + configuration.getOutputLocation());
+ compiler.compile((ICompilationUnit[])compilationUnits.toArray(new ICompilationUnit[compilationUnits.size()]));
+
+ return compilerErrors;
+ }
+
+ public String[] createCommandLine(CompilerConfiguration config) throws CompilerException {
+ return null;
+ }
+}
Added: tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/resources/META-INF/plexus/components.xml?rev=707961&view=auto
==============================================================================
--- tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/resources/META-INF/plexus/components.xml (added)
+++ tuscany/branches/sca-equinox/tools/maven/maven-eclipse-compiler/src/main/resources/META-INF/plexus/components.xml Sun Oct 26 02:44:19 2008
@@ -0,0 +1,28 @@
+<?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.
+-->
+<component-set>
+ <components>
+ <component>
+ <role>org.codehaus.plexus.compiler.Compiler</role>
+ <role-hint>tuscany-eclipse</role-hint>
+ <implementation>org.apache.tuscany.sca.tools.maven.compiler.JavaCompiler</implementation>
+ </component>
+ </components>
+</component-set>
Modified: tuscany/branches/sca-equinox/tools/maven/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/tools/maven/pom.xml?rev=707961&r1=707960&r2=707961&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/tools/maven/pom.xml (original)
+++ tuscany/branches/sca-equinox/tools/maven/pom.xml Sun Oct 26 02:44:19 2008
@@ -38,12 +38,13 @@
</activation>
<modules>
<module>maven-ant-generator</module>
+ <module>maven-bundle-plugin</module>
<module>maven-dependency-lister</module>
+ <module>maven-eclipse-compiler</module>
<module>maven-incremental-build</module>
<module>maven-java2wsdl</module>
<module>maven-web-junit</module>
<module>maven-wsdl2java</module>
- <module>maven-bundle-plugin</module>
</modules>
</profile>
</profiles>