You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 09:21:11 UTC
[sling-org-apache-sling-commons-compiler] annotated tag
org.apache.sling.commons.compiler-2.1.0 created (now 302c531)
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a change to annotated tag org.apache.sling.commons.compiler-2.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-compiler.git.
at 302c531 (tag)
tagging 85d678c2c5c5c1da8536c0c4795c87565b51c4c5 (commit)
by Carsten Ziegeler
on Tue Nov 27 10:32:03 2012 +0000
- Log -----------------------------------------------------------------
org.apache.sling.commons.compiler-2.1.0
-----------------------------------------------------------------------
This annotated tag includes the following new commits:
new f497e80 SLING-873 : Add new commons compiler bundle. Applied patch from Stefan Guggisberg.
new 71a6b19 Ignore the target directory.
new 715e761 SLING-874 - Use correct header.
new 640e371 Add missing private package and correct javadoc generation.
new 8d54570 SLING-884 : Apply patch from Stefan Guggisberg for pom fixing and code cleanup.
new c9002db Use release parent pom
new 06372a8 Use new dev parent pom for contrib.
new c59c885 Set parent pom to released version.
new a999f86 Ignore hidden files (Eclipse .project, etc.)
new 2006f88 Move Sling to new TLP location
new 4f017a9 SLING-1011 : Remove disclaimer file.
new dfde97a SLING-1011 : Adjust svn location
new f08f2f4 SLING-1011 : Remove disclaimer from readme's, adjust links to webite, fix versions in poms.
new 348cc49 SLING-1033 Upgrade to Sling parent POM 6 (and ensure web app has the leglize stuff, too)
new f5c7f26 Remove empty code and prints to system out.
new 9176bc6 Update to latest release.
new c80f3f0 [maven-release-plugin] prepare release org.apache.sling.commons.compiler-1.0.0
new 9a15676 [maven-release-plugin] prepare for next development iteration
new 26c5d31 Export version 1.0.0 of the API
new b228898 SLING-1205 Upgrade all projects to parent POM 8 and use OSGi provided OSGi libraries
new 21155d0 SLING-1436 Upgrade Eclipse compiler to latest version 3.3.0-v_771
new 64fdb9e SLING-1451 : Clean up compiler API and use classloading infrastructure
new b50cd86 SLING-1451 : Clean up compiler API and use classloading infrastructure
new d8d0a63 SLING-1451 : Clean up compiler API and use classloading infrastructure
new fedaf7f SLING-1459 : Make references to class loader manager and class loader writer dynamic
new 028f3d4 Use released parent pom.
new 2040e0d Add serial version
new 6238b6a SLING-1809 : Eclipse compiler used in commons.compiler causes "Illegal type in constant pool" with
new 2c73dc8 Remove obsolete notice/licence files.
new 759f50c [maven-release-plugin] prepare release org.apache.sling.commons.compiler-2.0.0
new 349761b [maven-release-plugin] prepare for next development iteration
new 279e777 SLING-1930 : Compilation message contains only class name without package information
new e982a99 [maven-release-plugin] prepare release org.apache.sling.commons.compiler-2.0.2
new c7c0b61 [maven-release-plugin] prepare for next development iteration
new a889fa1 SLING-2150 : Update plugins to use the latest available versions
new 519a563 Update to recent snapshot
new fdde6b9 Using latest released parent pom
new 2e97b65 SLING-2447 : ClassLoaderWriter should provide class loader for loading written classes/resources
new ed60b9b Use latest parent pom in all projects
new f397b5b Update to latest released version
new 9fea027 [maven-release-plugin] prepare release org.apache.sling.commons.compiler-2.0.4
new c04277a [maven-release-plugin] prepare for next development iteration
new ff4083b Prepare after release
new 9daf5a2 SLING-2480 : Add config for maven-sling-plugin to m2e configuration
new 5b5bac1 Use released version of commons classloader
new 78a535d SLING-2509 - changing file name in compiler to be slash delimited instead of period delimited to generate correct debug information (thanks to Stefan Guggisberg for the patch)
new 84ef18a Prepare releases
new 902d2d9 [maven-release-plugin] prepare release org.apache.sling.commons.compiler-2.0.6
new fc4ba98 [maven-release-plugin] prepare for next development iteration
new d0f852a After release
new 6c2e0ea Update to latest parent pom
new 9e335c9 Use released versions
new dade745 SLING-1732 - adding ability to explicitly define the source file name
new cd7556b SLING-2677 : Compilation should work with no provided class loader
new 2ca37aa [maven-release-plugin] prepare release org.apache.sling.commons.compiler-2.1.0
new 85d678c [maven-release-plugin] copy for tag org.apache.sling.commons.compiler-2.1.0
The 56 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
--
To stop receiving notification emails like this one, please contact
['"commits@sling.apache.org" <co...@sling.apache.org>'].
[sling-org-apache-sling-commons-compiler] 05/08: SLING-1732 -
adding ability to explicitly define the source file name
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.commons.compiler-2.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-compiler.git
commit dade7453e45b9cd71f47f26af3bddb764078ae9c
Author: Justin Edelson <ju...@apache.org>
AuthorDate: Tue Oct 23 09:57:07 2012 +0000
SLING-1732 - adding ability to explicitly define the source file name
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/commons/compiler@1401229 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
.../compiler/CompilationUnitWithSource.java | 27 ++++++++++++++++++++++
.../commons/compiler/impl/EclipseJavaCompiler.java | 7 +++++-
3 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index edc953c..35fe2c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
!org.eclipse.*,*
</Import-Package>
<Export-Package>
- org.apache.sling.commons.compiler;version=2.0.0
+ org.apache.sling.commons.compiler;version=2.1.0
</Export-Package>
<Private-Package>
org.apache.sling.commons.compiler.impl
diff --git a/src/main/java/org/apache/sling/commons/compiler/CompilationUnitWithSource.java b/src/main/java/org/apache/sling/commons/compiler/CompilationUnitWithSource.java
new file mode 100644
index 0000000..9a4921b
--- /dev/null
+++ b/src/main/java/org/apache/sling/commons/compiler/CompilationUnitWithSource.java
@@ -0,0 +1,27 @@
+/*
+ * 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.sling.commons.compiler;
+
+/**
+ * Extension of the CompilationUnit interface which allows for the explicit
+ * declaration of the source file name.
+ * @since 2.1
+ */
+public interface CompilationUnitWithSource extends CompilationUnit {
+
+ String getFileName();
+}
diff --git a/src/main/java/org/apache/sling/commons/compiler/impl/EclipseJavaCompiler.java b/src/main/java/org/apache/sling/commons/compiler/impl/EclipseJavaCompiler.java
index 0f4e49f..76dda71 100644
--- a/src/main/java/org/apache/sling/commons/compiler/impl/EclipseJavaCompiler.java
+++ b/src/main/java/org/apache/sling/commons/compiler/impl/EclipseJavaCompiler.java
@@ -33,6 +33,7 @@ import org.apache.felix.scr.annotations.Service;
import org.apache.sling.commons.classloader.ClassLoaderWriter;
import org.apache.sling.commons.compiler.CompilationResult;
import org.apache.sling.commons.compiler.CompilationUnit;
+import org.apache.sling.commons.compiler.CompilationUnitWithSource;
import org.apache.sling.commons.compiler.JavaCompiler;
import org.apache.sling.commons.compiler.Options;
import org.eclipse.jdt.core.compiler.CategorizedProblem;
@@ -453,7 +454,11 @@ public class EclipseJavaCompiler implements JavaCompiler {
* @see org.eclipse.jdt.internal.compiler.env.IDependent#getFileName()
*/
public char[] getFileName() {
- return (this.packageName.replace('.', '/') + '/' + this.mainTypeName + ".java").toCharArray();
+ if (compUnit instanceof CompilationUnitWithSource) {
+ return ((CompilationUnitWithSource)compUnit).getFileName().toCharArray();
+ } else {
+ return (this.packageName.replace('.', '/') + '/' + this.mainTypeName + ".java").toCharArray();
+ }
}
}
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-commons-compiler] 03/08: Update to latest
parent pom
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.commons.compiler-2.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-compiler.git
commit 6c2e0eac234aaff721909b4ff067dc1435170181
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Thu Jul 5 09:29:47 2012 +0000
Update to latest parent pom
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/commons/compiler@1357521 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 80e3795..07aa750 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>13-SNAPSHOT</version>
+ <version>14-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-commons-compiler] 07/08:
[maven-release-plugin] prepare release
org.apache.sling.commons.compiler-2.1.0
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.commons.compiler-2.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-compiler.git
commit 2ca37aad9c661cc2c0dd4cd681a36255d050acfa
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Nov 27 10:31:48 2012 +0000
[maven-release-plugin] prepare release org.apache.sling.commons.compiler-2.1.0
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/commons/compiler@1414101 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 35fe2c1..de15fbf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>org.apache.sling.commons.compiler</artifactId>
- <version>2.0.7-SNAPSHOT</version>
+ <version>2.1.0</version>
<packaging>bundle</packaging>
<name>Apache Sling Commons Java Compiler</name>
@@ -38,9 +38,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/commons/compiler</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/commons/compiler</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/trunk/contrib/commons/compiler</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.compiler-2.1.0</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.compiler-2.1.0</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.commons.compiler-2.1.0</url>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-commons-compiler] 02/08: After release
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.commons.compiler-2.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-compiler.git
commit d0f852ae343d32b4e9e522b7b41928beb7231da8
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Jun 25 14:00:28 2012 +0000
After release
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/commons/compiler@1353559 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index b50d19b..80e3795 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>12</version>
+ <version>13-SNAPSHOT</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-commons-compiler] 08/08:
[maven-release-plugin] copy for tag org.apache.sling.commons.compiler-2.1.0
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.commons.compiler-2.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-compiler.git
commit 85d678c2c5c5c1da8536c0c4795c87565b51c4c5
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Nov 27 10:32:03 2012 +0000
[maven-release-plugin] copy for tag org.apache.sling.commons.compiler-2.1.0
git-svn-id: https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.compiler-2.1.0@1414102 13f79535-47bb-0310-9956-ffa450edef68
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-commons-compiler] 04/08: Use released
versions
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.commons.compiler-2.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-compiler.git
commit 9e335c994b924da9c4fb247eaaf7885464b35e08
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Jul 10 11:07:18 2012 +0000
Use released versions
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/commons/compiler@1359601 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 07aa750..edc953c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
- <version>14-SNAPSHOT</version>
+ <version>13</version>
<relativePath>../../../parent/pom.xml</relativePath>
</parent>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-commons-compiler] 06/08: SLING-2677 :
Compilation should work with no provided class loader
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.commons.compiler-2.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-compiler.git
commit cd7556b04e2b675cb183e610c00465e03f75b19a
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Nov 26 12:10:26 2012 +0000
SLING-2677 : Compilation should work with no provided class loader
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/commons/compiler@1413570 13f79535-47bb-0310-9956-ffa450edef68
---
.../apache/sling/commons/compiler/impl/EclipseJavaCompiler.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/apache/sling/commons/compiler/impl/EclipseJavaCompiler.java b/src/main/java/org/apache/sling/commons/compiler/impl/EclipseJavaCompiler.java
index 76dda71..8e7f0f7 100644
--- a/src/main/java/org/apache/sling/commons/compiler/impl/EclipseJavaCompiler.java
+++ b/src/main/java/org/apache/sling/commons/compiler/impl/EclipseJavaCompiler.java
@@ -83,17 +83,24 @@ public class EclipseJavaCompiler implements JavaCompiler {
} else if ( options.get(Options.KEY_ADDITIONAL_CLASS_LOADER) != null ) {
final ClassLoader additionalClassLoader = (ClassLoader)options.get(Options.KEY_ADDITIONAL_CLASS_LOADER);
loader = new ClassLoader(classLoaderWriter.getClassLoader()) {
+ @Override
protected Class<?> findClass(String name)
throws ClassNotFoundException {
return additionalClassLoader.loadClass(name);
}
+ @Override
protected URL findResource(String name) {
return additionalClassLoader.getResource(name);
}
};
} else {
- loader = classLoaderWriter.getClassLoader();
+ final ClassLoader cl = classLoaderWriter.getClassLoader();
+ if ( cl == null ) {
+ loader = this.classLoaderWriter.getClassLoader();
+ } else {
+ loader = cl;
+ }
}
return loader;
}
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.
[sling-org-apache-sling-commons-compiler] 01/08:
[maven-release-plugin] prepare for next development iteration
Posted by ro...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.commons.compiler-2.1.0
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-compiler.git
commit fc4ba988a95298fb663bcdef2da839b110f6fea2
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Jun 25 13:45:47 2012 +0000
[maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/commons/compiler@1353539 13f79535-47bb-0310-9956-ffa450edef68
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index aeb21ea..b50d19b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
</parent>
<artifactId>org.apache.sling.commons.compiler</artifactId>
- <version>2.0.6</version>
+ <version>2.0.7-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Sling Commons Java Compiler</name>
@@ -38,9 +38,9 @@
</description>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.compiler-2.0.6</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/tags/org.apache.sling.commons.compiler-2.0.6</developerConnection>
- <url>http://svn.apache.org/viewvc/sling/tags/org.apache.sling.commons.compiler-2.0.6</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/sling/trunk/contrib/commons/compiler</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/sling/trunk/contrib/commons/compiler</developerConnection>
+ <url>http://svn.apache.org/viewvc/sling/trunk/contrib/commons/compiler</url>
</scm>
<build>
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.