You are viewing a plain text version of this content. The canonical link for it is here.
Posted to xbean-scm@geronimo.apache.org by jl...@apache.org on 2009/05/22 15:50:18 UTC
svn commit: r777524 - in /geronimo/xbean/trunk: ./ xbean-asm-shaded/
xbean-finder/ xbean-finder/src/main/java/org/apache/xbean/finder/
xbean-reflect/ xbean-reflect/src/main/java/org/apache/xbean/recipe/
Author: jlaskowski
Date: Fri May 22 13:50:18 2009
New Revision: 777524
URL: http://svn.apache.org/viewvc?rev=777524&view=rev
Log:
ASM shading (new module xbean-asm-shaded) so org.objectweb.asm becomes org.apache.xbean.asm + some less important stuff
Added:
geronimo/xbean/trunk/xbean-asm-shaded/
geronimo/xbean/trunk/xbean-asm-shaded/pom.xml (with props)
Modified:
geronimo/xbean/trunk/pom.xml
geronimo/xbean/trunk/xbean-finder/pom.xml
geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/ClassFinder.java
geronimo/xbean/trunk/xbean-reflect/pom.xml
geronimo/xbean/trunk/xbean-reflect/src/main/java/org/apache/xbean/recipe/AsmParameterNameLoader.java
Modified: geronimo/xbean/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/pom.xml?rev=777524&r1=777523&r2=777524&view=diff
==============================================================================
--- geronimo/xbean/trunk/pom.xml (original)
+++ geronimo/xbean/trunk/pom.xml Fri May 22 13:50:18 2009
@@ -50,14 +50,14 @@
</scm>
<properties>
- <siteId>xbean</siteId>
- <!--
- |
- | Geronimo OSGi properties
- |
- | Note: when modules can override these properties.
- |
- -->
+ <siteId>xbean</siteId>
+ <!--
+ |
+ | OSGi properties
+ |
+ | Note: when modules can override these properties.
+ |
+ -->
<xbean.osgi.import.pkg>*</xbean.osgi.import.pkg>
<xbean.osgi.export.pkg>org.apache.xbean*</xbean.osgi.export.pkg>
<xbean.osgi.private.pkg />
@@ -65,6 +65,11 @@
<xbean.osgi.export.version>${project.version}</xbean.osgi.export.version>
<xbean.osgi.import>!META-INF*,${xbean.osgi.import.pkg}</xbean.osgi.import>
<xbean.osgi.symbolic.name>${groupId}.${artifactId}</xbean.osgi.symbolic.name>
+
+ <!--
+ - http://docs.codehaus.org/display/MAVENUSER/POM+Element+for+Source+File+Encoding
+ -->
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
@@ -145,6 +150,15 @@
</roles>
<timezone>+1</timezone>
</developer>
+ <developer>
+ <id>jlaskowski</id>
+ <name>Jacek Laskowski</name>
+ <email>jacek@laskowski.net.pl</email>
+ <roles>
+ <role>Commiter</role>
+ </roles>
+ <timezone>+1</timezone>
+ </developer>
</developers>
<dependencyManagement>
@@ -205,12 +219,6 @@
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jmx</artifactId>
- <version>2.0.5</version>
- </dependency>
-
- <dependency>
<groupId>com.thoughtworks.qdox</groupId>
<artifactId>qdox</artifactId>
<version>1.6.3</version>
@@ -323,8 +331,7 @@
</configuration>
</plugin>
</plugins>
- </build>
-
+ </build>
<profiles>
<profile>
<id>release</id>
@@ -408,6 +415,7 @@
<module>xbean-spring</module>
<module>xbean-telnet</module>
<module>maven-xbean-plugin</module>
+ <module>xbean-asm-shaded</module>
</modules>
<repositories>
@@ -451,7 +459,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.0</version>
+ <version>2.5</version>
<configuration>
<minmemory>128m</minmemory>
<maxmemory>512</maxmemory>
@@ -488,7 +496,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
- <version>2.1</version>
+ <version>2.4</version>
<configuration>
<targetJdk>1.5</targetJdk>
</configuration>
Added: geronimo/xbean/trunk/xbean-asm-shaded/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-asm-shaded/pom.xml?rev=777524&view=auto
==============================================================================
--- geronimo/xbean/trunk/xbean-asm-shaded/pom.xml (added)
+++ geronimo/xbean/trunk/xbean-asm-shaded/pom.xml Fri May 22 13:50:18 2009
@@ -0,0 +1,71 @@
+<?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.
+
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>xbean</artifactId>
+ <groupId>org.apache.xbean</groupId>
+ <version>3.6-SNAPSHOT</version>
+ </parent>
+ <artifactId>xbean-asm-shaded</artifactId>
+ <packaging>bundle</packaging>
+ <name>Apache XBean :: ASM shaded (repackaged)</name>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <relocations>
+ <relocation>
+ <pattern>org.objectweb.asm</pattern>
+ <shadedPattern>org.apache.xbean.asm</shadedPattern>
+ </relocation>
+ </relocations>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-commons</artifactId>
+ <version>3.1</version>
+ </dependency>
+ </dependencies>
+</project>
Propchange: geronimo/xbean/trunk/xbean-asm-shaded/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/xbean/trunk/xbean-asm-shaded/pom.xml
------------------------------------------------------------------------------
svn:executable = *
Propchange: geronimo/xbean/trunk/xbean-asm-shaded/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/xbean/trunk/xbean-asm-shaded/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: geronimo/xbean/trunk/xbean-finder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/pom.xml?rev=777524&r1=777523&r2=777524&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-finder/pom.xml (original)
+++ geronimo/xbean/trunk/xbean-finder/pom.xml Fri May 22 13:50:18 2009
@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -21,31 +20,23 @@
<!-- $Rev: 432962 $ $Date: 2006-08-20 03:47:39 -0700 (Sun, 20 Aug 2006) $ -->
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <artifactId>xbean</artifactId>
- <groupId>org.apache.xbean</groupId>
- <version>3.6-SNAPSHOT</version>
- </parent>
-
- <artifactId>xbean-finder</artifactId>
- <packaging>bundle</packaging>
- <name>Apache XBean :: Classpath Resource Finder</name>
-
- <dependencies>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm</artifactId>
- <version>3.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>asm</groupId>
- <artifactId>asm-commons</artifactId>
- <version>3.1</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>xbean</artifactId>
+ <groupId>org.apache.xbean</groupId>
+ <version>3.6-SNAPSHOT</version>
+ </parent>
+ <artifactId>xbean-finder</artifactId>
+ <packaging>bundle</packaging>
+ <name>Apache XBean :: Classpath Resource Finder</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-asm-shaded</artifactId>
+ <version>${version}</version>
+ </dependency>
+ </dependencies>
</project>
Modified: geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/ClassFinder.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/ClassFinder.java?rev=777524&r1=777523&r2=777524&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/ClassFinder.java (original)
+++ geronimo/xbean/trunk/xbean-finder/src/main/java/org/apache/xbean/finder/ClassFinder.java Fri May 22 13:50:18 2009
@@ -16,11 +16,11 @@
*/
package org.apache.xbean.finder;
-import org.objectweb.asm.AnnotationVisitor;
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.FieldVisitor;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.commons.EmptyVisitor;
+import org.apache.xbean.asm.AnnotationVisitor;
+import org.apache.xbean.asm.ClassReader;
+import org.apache.xbean.asm.FieldVisitor;
+import org.apache.xbean.asm.MethodVisitor;
+import org.apache.xbean.asm.commons.EmptyVisitor;
import java.io.File;
import java.io.IOException;
Modified: geronimo/xbean/trunk/xbean-reflect/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-reflect/pom.xml?rev=777524&r1=777523&r2=777524&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-reflect/pom.xml (original)
+++ geronimo/xbean/trunk/xbean-reflect/pom.xml Fri May 22 13:50:18 2009
@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -19,18 +18,20 @@
-->
- <modelVersion>4.0.0</modelVersion>
+<!-- $Rev: 432962 $ $Date: 2006-08-20 03:47:39 -0700 (Sun, 20 Aug 2006) $ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>xbean</artifactId>
<groupId>org.apache.xbean</groupId>
<version>3.6-SNAPSHOT</version>
</parent>
-
<artifactId>xbean-reflect</artifactId>
<packaging>bundle</packaging>
<name>Apache XBean :: Reflect</name>
-
<dependencies>
<dependency>
<groupId>asm</groupId>
@@ -59,9 +60,9 @@
<optional>true</optional>
</dependency>
</dependencies>
-
<profiles>
<profile>
+ <id>debug</id>
<activation>
<property>
<name>DEBUG</name>
Modified: geronimo/xbean/trunk/xbean-reflect/src/main/java/org/apache/xbean/recipe/AsmParameterNameLoader.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-reflect/src/main/java/org/apache/xbean/recipe/AsmParameterNameLoader.java?rev=777524&r1=777523&r2=777524&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-reflect/src/main/java/org/apache/xbean/recipe/AsmParameterNameLoader.java (original)
+++ geronimo/xbean/trunk/xbean-reflect/src/main/java/org/apache/xbean/recipe/AsmParameterNameLoader.java Fri May 22 13:50:18 2009
@@ -84,7 +84,7 @@
}
/**
- * Gets the parameter names of all constructoror null if the class was compiled without debug symbols on.
+ * Gets the parameter names of all constructor or null if the class was compiled without debug symbols on.
* @param clazz the class for which the constructor parameter names should be retrieved
* @return a map from Constructor object to the parameter names or null if the class was compiled without debug symbols on
*/