6 files changed, 201 insertions, 0 deletions
diff --git a/rules/xbean-bootstrap/delete.list b/rules/xbean-bootstrap/delete.list
new file mode 100644
index 0000000..e7a7dae
--- /dev/null
+++ b/rules/xbean-bootstrap/delete.list
@@ -0,0 +1,5 @@
+*-shaded
+maven-*-plugin
+xbean-blueprint
+xbean-bundleutils/src/main/java/org/apache/xbean/osgi/bundle/util/equinox
+xbean-spring
diff --git a/rules/xbean-bootstrap/no-groovy.patch b/rules/xbean-bootstrap/no-groovy.patch
new file mode 100644
index 0000000..f70bf3a
--- /dev/null
+++ b/rules/xbean-bootstrap/no-groovy.patch
@@ -0,0 +1,91 @@
+diff -ruN xbean-bootstrap.orig/xbean-telnet/src/main/java/org/apache/xbean/command/CommandRegistry.java xbean-bootstrap/xbean-telnet/src/main/java/org/apache/xbean/command/CommandRegistry.java
+--- xbean-bootstrap.orig/xbean-telnet/src/main/java/org/apache/xbean/command/CommandRegistry.java	2014-06-15 00:19:37.435655683 -0400
++++ xbean-bootstrap/xbean-telnet/src/main/java/org/apache/xbean/command/CommandRegistry.java	2014-06-15 00:47:21.422787368 -0400
+@@ -77,6 +77,5 @@
+         Help.register();
+         Lookup.register();
+         Version.register();
+-        GroovySh.register();
+     }
+ }
+diff -ruN xbean-bootstrap.orig/xbean-telnet/src/main/java/org/apache/xbean/command/GroovySh.java xbean-bootstrap/xbean-telnet/src/main/java/org/apache/xbean/command/GroovySh.java
+--- xbean-bootstrap.orig/xbean-telnet/src/main/java/org/apache/xbean/command/GroovySh.java	2014-06-15 00:19:37.438988951 -0400
++++ xbean-bootstrap/xbean-telnet/src/main/java/org/apache/xbean/command/GroovySh.java	1969-12-31 19:00:00.000000000 -0500
+@@ -1,77 +0,0 @@
+-/**
+- * 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.xbean.command;
+-
+-import groovy.lang.GroovyShell;
+-import org.codehaus.groovy.runtime.InvokerHelper;
+-
+-import java.io.BufferedReader;
+-import java.io.IOException;
+-import java.io.InputStream;
+-import java.io.InputStreamReader;
+-import java.io.PrintStream;
+-
+-public class GroovySh implements Command {
+-    public static void register() {
+-        CommandRegistry.register("groovysh", GroovySh.class);
+-    }
+-
+-    public int main(String[] args, InputStream in, PrintStream out) {
+-        GroovyShell shell = new GroovyShell();
+-        BufferedReader reader = new BufferedReader(new InputStreamReader(in));
+-        String version = InvokerHelper.getVersion();
+-        out.println("Lets get Groovy!");
+-        out.println("================");
+-        out.println("Version: " + version + " JVM: " + System.getProperty("java.vm.version"));
+-        out.println("Hit carriage return twice to execute a command");
+-        out.println("The command 'quit' will terminate the shell");
+-        int counter = 1;
+-        while (true) {
+-            StringBuffer buffer = new StringBuffer();
+-            while (true) {
+-                out.print("groovy> ");
+-                String line;
+-                try {
+-                    line = reader.readLine();
+-                } catch (IOException e) {
+-                    out.println("Caught: " + e);
+-                    e.printStackTrace();
+-                    return -1;
+-                }
+-                if (line != null) {
+-                    buffer.append(line);
+-                    buffer.append('\n');
+-                }
+-                if (line == null || line.trim().length() == 0) {
+-                    break;
+-                }
+-            }
+-            String command = buffer.toString().trim();
+-            if (command == null || command.equals("quit")) {
+-                break;
+-            }
+-            try {
+-                Object answer = shell.evaluate(command, "CommandLine" + counter++ + ".groovy");
+-                out.println(InvokerHelper.inspect(answer));
+-            } catch (Exception e) {
+-                out.println("Caught: " + e);
+-                e.printStackTrace();
+-            }
+-        }
+-        return 0;
+-    }
+-}
diff --git a/rules/xbean-bootstrap/no-log4j.patch b/rules/xbean-bootstrap/no-log4j.patch
new file mode 100644
index 0000000..b5adb0c
--- /dev/null
+++ b/rules/xbean-bootstrap/no-log4j.patch
@@ -0,0 +1,51 @@
+diff -ruN xbean-bootstrap.orig/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/Log4jConverter.java xbean-bootstrap/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/Log4jConverter.java
+--- xbean-bootstrap.orig/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/Log4jConverter.java	2014-06-15 00:19:37.108995430 -0400
++++ xbean-bootstrap/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/Log4jConverter.java	1969-12-31 19:00:00.000000000 -0500
+@@ -1,32 +0,0 @@
+-/**
+- * 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.xbean.propertyeditor;
+-
+-import org.apache.log4j.Logger;
+-
+-/**
+- * @version $Rev$ $Date$
+- */
+-public class Log4jConverter extends AbstractConverter {
+-    public Log4jConverter() {
+-        super(Logger.class);
+-    }
+-
+-    protected Object toObjectImpl(String text) {
+-        return Logger.getLogger(text);
+-    }
+-}
+diff -ruN xbean-bootstrap.orig/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditors.java xbean-bootstrap/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditors.java
+--- xbean-bootstrap.orig/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditors.java	2014-06-15 00:19:37.082329286 -0400
++++ xbean-bootstrap/xbean-reflect/src/main/java/org/apache/xbean/propertyeditor/PropertyEditors.java	2014-06-15 00:42:19.005548051 -0400
+@@ -122,11 +122,6 @@
+         registerConverter(new WeakHashMapEditor());
+ 
+         try {
+-            registerConverter(new Log4jConverter());
+-        } catch (Throwable e) {
+-        }
+-
+-        try {
+             registerConverter(new CommonsLoggingConverter());
+         } catch (Throwable e) {
+         }
diff --git a/rules/xbean-bootstrap/no-shading.patch b/rules/xbean-bootstrap/no-shading.patch
new file mode 100644
index 0000000..0ad79d7
--- /dev/null
+++ b/rules/xbean-bootstrap/no-shading.patch
@@ -0,0 +1,32 @@
+diff -ru xbean-bootstrap.orig/xbean-reflect/src/main/java/org/apache/xbean/recipe/ReflectionUtil.java xbean-bootstrap/xbean-reflect/src/main/java/org/apache/xbean/recipe/ReflectionUtil.java
+--- xbean-bootstrap.orig/xbean-reflect/src/main/java/org/apache/xbean/recipe/ReflectionUtil.java	2014-06-15 00:19:37.188993859 -0400
++++ xbean-bootstrap/xbean-reflect/src/main/java/org/apache/xbean/recipe/ReflectionUtil.java	2014-06-15 00:35:25.070408339 -0400
+@@ -43,7 +43,7 @@
+     private static ParameterNameLoader parameterNamesLoader;
+     
+     static {
+-        if (isClassAvailable("org.apache.xbean.asm.ClassReader")) {
++        if (isClassAvailable("org.objectweb.asm.ClassReader")) {
+             parameterNamesLoader = new XbeanAsmParameterNameLoader();
+         } else if (isClassAvailable("org.objectweb.asm.ClassReader")) {
+             parameterNamesLoader = new AsmParameterNameLoader();                    
+diff -ru xbean-bootstrap.orig/xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java xbean-bootstrap/xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java
+--- xbean-bootstrap.orig/xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java	2014-06-15 00:19:37.188993859 -0400
++++ xbean-bootstrap/xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java	2014-06-15 00:35:25.070408339 -0400
+@@ -30,11 +30,11 @@
+ import java.util.WeakHashMap;
+ import java.util.Arrays;
+ 
+-import org.apache.xbean.asm.ClassReader;
+-import org.apache.xbean.asm.Label;
+-import org.apache.xbean.asm.MethodVisitor;
+-import org.apache.xbean.asm.Type;
+-import org.apache.xbean.asm.commons.EmptyVisitor;
++import org.objectweb.asm.ClassReader;
++import org.objectweb.asm.Label;
++import org.objectweb.asm.MethodVisitor;
++import org.objectweb.asm.Type;
++import org.objectweb.asm.commons.EmptyVisitor;
+ 
+ /**
+  * Implementation of ParameterNameLoader that uses ASM to read the parameter names from the local variable table in the
diff --git a/rules/xbean-bootstrap/no-springframework.patch b/rules/xbean-bootstrap/no-springframework.patch
new file mode 100644
index 0000000..c1cfc27
--- /dev/null
+++ b/rules/xbean-bootstrap/no-springframework.patch
@@ -0,0 +1,21 @@
+diff -ruN xbean-bootstrap.orig/xbean-classloader/src/main/java/org/apache/xbean/classloader/ThreadContextClassLoaderFactoryBean.java xbean-bootstrap/xbean-classloader/src/main/java/org/apache/xbean/classloader/ThreadContextClassLoaderFactoryBean.java
+--- xbean-bootstrap.orig/xbean-classloader/src/main/java/org/apache/xbean/classloader/ThreadContextClassLoaderFactoryBean.java	2014-06-15 00:19:37.572319666 -0400
++++ xbean-bootstrap/xbean-classloader/src/main/java/org/apache/xbean/classloader/ThreadContextClassLoaderFactoryBean.java	2014-06-15 00:51:06.431593352 -0400
+@@ -16,8 +16,6 @@
+  */
+ package org.apache.xbean.classloader;
+ 
+-import org.springframework.beans.factory.FactoryBean;
+-
+ /**
+  * A factory bean to expose the current thread context class loader.
+  * 
+@@ -25,7 +23,7 @@
+  *                         element="threadContextClassLoader" description="References the ClassLoader of the current thread context"
+  * @version $Revision: 437551 $
+  */
+-public class ThreadContextClassLoaderFactoryBean implements FactoryBean {
++public class ThreadContextClassLoaderFactoryBean {
+ 
+     public Object getObject() throws Exception {
+         return Thread.currentThread().getContextClassLoader();
diff --git a/rules/xbean-bootstrap/subdir-deps.mk b/rules/xbean-bootstrap/subdir-deps.mk
new file mode 100644
index 0000000..4eb0564
--- /dev/null
+++ b/rules/xbean-bootstrap/subdir-deps.mk
@@ -0,0 +1 @@
+xbean-finder_deps = xbean-bundleutils