Author: antelder
Date: Tue Feb 10 09:11:33 2009
New Revision: 742899
URL: http://svn.apache.org/viewvc?rev=742899&view=rev
Log:
Rename package from org.apache.tuscany.sca.tools.maven.compiler to
org.apache.tuscany.maven.compiler
Added:
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/maven/
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/maven/compiler/
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/maven/compiler/ClassLoaderNameEnvironment.java
(contents, props changed)
- copied, changed from r742897,
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/ClassLoaderNameEnvironment.java
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/maven/compiler/CompilerRequestor.java
(contents, props changed)
- copied, changed from r742897,
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/CompilerRequestor.java
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/maven/compiler/FileCompilationUnit.java
(contents, props changed)
- copied, changed from r742897,
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/FileCompilationUnit.java
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/maven/compiler/JavaCompiler.java
(contents, props changed)
- copied, changed from r742897,
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/JavaCompiler.java
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/maven/compiler/osgi/
(props changed)
- copied from r742897,
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/osgi/
Removed:
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/ClassLoaderNameEnvironment.java
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/CompilerRequestor.java
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/FileCompilationUnit.java
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/JavaCompiler.java
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/osgi/
Modified:
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/maven/compiler/osgi/BundleResolver.java
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/maven/compiler/osgi/BundleUtil.java
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/resources/META-INF/plexus/components.xml
Copied:
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/maven/compiler/ClassLoaderNameEnvironment.java
(from r742897,
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/ClassLoaderNameEnvironment.java)
URL:
http://svn.apache.org/viewvc/tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/maven/compiler/ClassLoaderNameEnvironment.java?p2=tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/maven/compiler/ClassLoaderNameEnvironment.java&p1=tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/ClassLoaderNameEnvironment.java&r1=742897&r2=742899&rev=742899&view=diff
==============================================================================
---
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/ClassLoaderNameEnvironment.java
(original)
+++
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/maven/compiler/ClassLoaderNameEnvironment.java
Tue Feb 10 09:11:33 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.tuscany.sca.tools.maven.compiler;
+package org.apache.tuscany.maven.compiler;
import java.io.ByteArrayOutputStream;
import java.io.File;
Propchange:
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/maven/compiler/ClassLoaderNameEnvironment.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Feb 10 09:11:33 2009
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/ClassLoaderNameEnvironment.java:671193
+/tuscany/java/sca/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/ClassLoaderNameEnvironment.java:694837-694843
Copied:
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/maven/compiler/CompilerRequestor.java
(from r742897,
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/CompilerRequestor.java)
URL:
http://svn.apache.org/viewvc/tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/maven/compiler/CompilerRequestor.java?p2=tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/maven/compiler/CompilerRequestor.java&p1=tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/CompilerRequestor.java&r1=742897&r2=742899&rev=742899&view=diff
==============================================================================
---
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/CompilerRequestor.java
(original)
+++
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/maven/compiler/CompilerRequestor.java
Tue Feb 10 09:11:33 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.tuscany.sca.tools.maven.compiler;
+package org.apache.tuscany.maven.compiler;
import java.io.File;
import java.io.FileNotFoundException;
Propchange:
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/maven/compiler/CompilerRequestor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Feb 10 09:11:33 2009
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/CompilerRequestor.java:671193
+/tuscany/java/sca/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/CompilerRequestor.java:694837-694843
Copied:
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/maven/compiler/FileCompilationUnit.java
(from r742897,
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/FileCompilationUnit.java)
URL:
http://svn.apache.org/viewvc/tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/maven/compiler/FileCompilationUnit.java?p2=tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/maven/compiler/FileCompilationUnit.java&p1=tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/FileCompilationUnit.java&r1=742897&r2=742899&rev=742899&view=diff
==============================================================================
---
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/FileCompilationUnit.java
(original)
+++
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/maven/compiler/FileCompilationUnit.java
Tue Feb 10 09:11:33 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.tuscany.sca.tools.maven.compiler;
+package org.apache.tuscany.maven.compiler;
import java.io.CharArrayWriter;
import java.io.FileInputStream;
Propchange:
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/maven/compiler/FileCompilationUnit.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Feb 10 09:11:33 2009
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/FileCompilationUnit.java:671193
+/tuscany/java/sca/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/FileCompilationUnit.java:694837-694843
Copied:
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/maven/compiler/JavaCompiler.java
(from r742897,
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/JavaCompiler.java)
URL:
http://svn.apache.org/viewvc/tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/maven/compiler/JavaCompiler.java?p2=tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/maven/compiler/JavaCompiler.java&p1=tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/JavaCompiler.java&r1=742897&r2=742899&rev=742899&view=diff
==============================================================================
---
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/JavaCompiler.java
(original)
+++
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/maven/compiler/JavaCompiler.java
Tue Feb 10 09:11:33 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.tuscany.sca.tools.maven.compiler;
+package org.apache.tuscany.maven.compiler;
import static
org.codehaus.plexus.compiler.CompilerOutputStyle.ONE_OUTPUT_FILE_PER_INPUT_FILE;
import static
org.eclipse.jdt.internal.compiler.DefaultErrorHandlingPolicies.proceedWithAllProblems;
@@ -44,8 +44,8 @@
import java.util.Map;
import java.util.Set;
-import org.apache.tuscany.sca.tools.maven.compiler.osgi.BundleResolver;
-import org.apache.tuscany.sca.tools.maven.compiler.osgi.BundleUtil;
+import org.apache.tuscany.maven.compiler.osgi.BundleResolver;
+import org.apache.tuscany.maven.compiler.osgi.BundleUtil;
import org.codehaus.plexus.compiler.AbstractCompiler;
import org.codehaus.plexus.compiler.CompilerConfiguration;
import org.codehaus.plexus.compiler.CompilerError;
Propchange:
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/maven/compiler/JavaCompiler.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Feb 10 09:11:33 2009
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/JavaCompiler.java:671193
+/tuscany/java/sca/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/JavaCompiler.java:694837-694843
Propchange:
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/maven/compiler/osgi/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Feb 10 09:11:33 2009
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/osgi:671193
+/tuscany/java/sca/tools/maven/maven-eclipse-compiler/src/main/java/org/apache/tuscany/sca/tools/maven/compiler/osgi:694837-694843
Modified:
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/maven/compiler/osgi/BundleResolver.java
URL:
http://svn.apache.org/viewvc/tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/maven/compiler/osgi/BundleResolver.java?rev=742899&r1=742897&r2=742899&view=diff
==============================================================================
---
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/maven/compiler/osgi/BundleResolver.java
(original)
+++
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/maven/compiler/osgi/BundleResolver.java
Tue Feb 10 09:11:33 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.tuscany.sca.tools.maven.compiler.osgi;
+package org.apache.tuscany.maven.compiler.osgi;
import static
org.eclipse.osgi.service.resolver.ResolverError.IMPORT_PACKAGE_USES_CONFLICT;
import static
org.eclipse.osgi.service.resolver.ResolverError.MISSING_FRAGMENT_HOST;
Modified:
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/maven/compiler/osgi/BundleUtil.java
URL:
http://svn.apache.org/viewvc/tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/maven/compiler/osgi/BundleUtil.java?rev=742899&r1=742897&r2=742899&view=diff
==============================================================================
---
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/maven/compiler/osgi/BundleUtil.java
(original)
+++
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/java/org/apache/tuscany/maven/compiler/osgi/BundleUtil.java
Tue Feb 10 09:11:33 2009
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.tuscany.sca.tools.maven.compiler.osgi;
+package org.apache.tuscany.maven.compiler.osgi;
import static org.osgi.framework.Constants.BUNDLE_CLASSPATH;
import static org.osgi.framework.Constants.BUNDLE_MANIFESTVERSION;
Modified:
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/resources/META-INF/plexus/components.xml
URL:
http://svn.apache.org/viewvc/tuscany/plugins/trunk/maven-eclipse-compiler/src/main/resources/META-INF/plexus/components.xml?rev=742899&r1=742898&r2=742899&view=diff
==============================================================================
---
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/resources/META-INF/plexus/components.xml
(original)
+++
tuscany/plugins/trunk/maven-eclipse-compiler/src/main/resources/META-INF/plexus/components.xml
Tue Feb 10 09:11:33 2009
@@ -22,7 +22,7 @@
<component>
<role>org.codehaus.plexus.compiler.Compiler</role>
<role-hint>tuscany-eclipse</role-hint>
-
<implementation>org.apache.tuscany.sca.tools.maven.compiler.JavaCompiler</implementation>
+
<implementation>org.apache.tuscany.maven.compiler.JavaCompiler</implementation>
</component>
</components>
</component-set>
