remove module omodel-conv and its deps since they have completed their task :)


Project: http://git-wip-us.apache.org/repos/asf/ode/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/a499545d
Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/a499545d
Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/a499545d

Branch: refs/heads/master
Commit: a499545d5f6fcb7f96dfb96708ab09bfc98c4839
Parents: 1094a2e
Author: fangzhen <[email protected]>
Authored: Wed Jul 30 10:41:38 2014 +0800
Committer: fangzhen <[email protected]>
Committed: Wed Jul 30 10:41:38 2014 +0800

----------------------------------------------------------------------
 Rakefile                                        |  10 +-
 dependencies.rb                                 |   2 -
 omodel-conv/Readme.md                           |   7 -
 omodel-conv/pom.xml                             |  53 -------
 omodel-conv/src/insts2                          |   4 -
 .../info/fzhen/ode/omodel_conv/Convertor.java   |  58 --------
 .../fzhen/ode/omodel_conv/FieldAcc2Getter.java  |  50 -------
 .../ode/omodel_conv/FieldAccConvertor.java      |  41 ------
 .../fzhen/ode/omodel_conv/FieldAccessorGen.java | 138 -------------------
 .../ode/omodel_conv/FieldAssign2Setter.java     |  58 --------
 omodel-conv/src/main/java/log4j.properties      |  16 ---
 omodel-conv/src/sed_insts1                      |   5 -
 omodel-conv/src/sed_insts2                      |   4 -
 13 files changed, 1 insertion(+), 445 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ode/blob/a499545d/Rakefile
----------------------------------------------------------------------
diff --git a/Rakefile b/Rakefile
index b03ccee..59743e2 100644
--- a/Rakefile
+++ b/Rakefile
@@ -224,15 +224,7 @@ define "ode" do
     package :jar
        test.with XERCES
   end
-  
-  desc "Helper to covert from old OModel to new OModel"
-  define "omodel-conv" do
-       compile.with projects("bpel-obj", "bpel-nobj", "bpel-compiler", 
"bpel-api", "bpel-schemas", "utils"), 
-               JAVAX.stream, JAXEN, SAXON, WSDL4J, XALAN, XERCES, 
COMMONS.collections, SLF4J,
-               JACKSON, SPOON, COMMONS.io, COMMONS.logging, LOG4J
-       package :jar
-  end
-  
+
   desc "ODE BPEL Query Language"
   define "bpel-ql" do
     pkg_name = "org.apache.ode.ql.jcc"

http://git-wip-us.apache.org/repos/asf/ode/blob/a499545d/dependencies.rb
----------------------------------------------------------------------
diff --git a/dependencies.rb b/dependencies.rb
index 9352d69..9039110 100644
--- a/dependencies.rb
+++ b/dependencies.rb
@@ -138,8 +138,6 @@ SERVICEMIX          = [
                         "tranql:tranql-connector-derby-common:jar:1.1"
                         ]
 SLF4J = group(%w{ slf4j-api slf4j-log4j12 jcl-over-slf4j }, 
:under=>"org.slf4j", :version=>"1.7.2")
-SPOON               = ["fr.inria.gforge.spoon:spoon-core:jar:3.0-SNAPSHOT", 
'com.martiansoftware:jsap:jar:2.1', 
-                       "org.eclipse.jdt.core.compiler:ecj:jar:4.2.2"]
 SPRING              = ["org.springframework:spring:jar:2.5.6"]
 SPRING_OSGI         = ["org.springframework.osgi:spring-osgi-core:jar:1.2.0"]
 SPRING_TEST         = ["org.springframework:spring-test:jar:2.5.6"]

http://git-wip-us.apache.org/repos/asf/ode/blob/a499545d/omodel-conv/Readme.md
----------------------------------------------------------------------
diff --git a/omodel-conv/Readme.md b/omodel-conv/Readme.md
deleted file mode 100644
index a4e270d..0000000
--- a/omodel-conv/Readme.md
+++ /dev/null
@@ -1,7 +0,0 @@
-This sub-project is a helper to migrate from old OModel to new OModel(bpel-obj 
--> bpel-nobj)  
-It mainly use spoon (http://spoon.gforge.inria.fr/) to analyze java source 
code which uses eclipse jdt backend.  
-There are two converter currently. The converter are supported by processors 
in turn.  
-
-After applying the converter, the sed scripts are used to handle some other 
things.  
-sed_inst1 -- Convertor
-sec_inst2 -- FieldAccConvertor

http://git-wip-us.apache.org/repos/asf/ode/blob/a499545d/omodel-conv/pom.xml
----------------------------------------------------------------------
diff --git a/omodel-conv/pom.xml b/omodel-conv/pom.xml
deleted file mode 100644
index a57c948..0000000
--- a/omodel-conv/pom.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<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/xsd/maven-4.0.0.xsd";>
-       <modelVersion>4.0.0</modelVersion>
-
-       <groupId>info.fzhen.ode</groupId>
-       <artifactId>omodel-conv</artifactId>
-       <version>0.0.1-SNAPSHOT</version>
-       <packaging>jar</packaging>
-
-       <name>omodel-conv</name>
-       <url>http://maven.apache.org</url>
-
-       <properties>
-               
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-       </properties>
-       <dependencies>
-               <dependency>
-                       <groupId>fr.inria.gforge.spoon</groupId>
-                       <artifactId>spoon-core</artifactId>
-                       <version>2.0</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.fasterxml.jackson.core</groupId>
-                       <artifactId>jackson-core</artifactId>
-                       <version>2.4.0</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.fasterxml.jackson.core</groupId>
-                       <artifactId>jackson-databind</artifactId>
-                       <version>2.4.0</version>
-               </dependency>
-               <dependency>
-                       <groupId>com.fasterxml.jackson.core</groupId>
-                       <artifactId>jackson-annotations</artifactId>
-                       <version>2.4.0</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <version>4.11</version>
-                       <scope>test</scope>
-               </dependency>
-       </dependencies>
-       <repositories>
-               <repository>
-                       <id>gforge.inria.fr-release</id>
-                       <name>Maven Repository for Spoon</name>
-                       
<url>http://spoon.gforge.inria.fr/repositories/releases/</url>
-                       <releases />
-               </repository>
-       </repositories>
-</project>

http://git-wip-us.apache.org/repos/asf/ode/blob/a499545d/omodel-conv/src/insts2
----------------------------------------------------------------------
diff --git a/omodel-conv/src/insts2 b/omodel-conv/src/insts2
deleted file mode 100644
index 94405ac..0000000
--- a/omodel-conv/src/insts2
+++ /dev/null
@@ -1,4 +0,0 @@
-s/implements Serializable//
-s/@com.fasterxml.jackson.annotation.JsonIgnore/@JsonIgnore/
-0,/^import/{s/^import/import 
com.fasterxml.jackson.annotation.JsonIgnore\;\nimport/}
-/serialVersionUID/d

http://git-wip-us.apache.org/repos/asf/ode/blob/a499545d/omodel-conv/src/main/java/info/fzhen/ode/omodel_conv/Convertor.java
----------------------------------------------------------------------
diff --git 
a/omodel-conv/src/main/java/info/fzhen/ode/omodel_conv/Convertor.java 
b/omodel-conv/src/main/java/info/fzhen/ode/omodel_conv/Convertor.java
deleted file mode 100644
index 42d09c0..0000000
--- a/omodel-conv/src/main/java/info/fzhen/ode/omodel_conv/Convertor.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package info.fzhen.ode.omodel_conv;
-
-import spoon.Launcher;
-
-/**
- * Main class to execute the convert. This convertor did three things 
currently, as the three processor indicates.
- * @author fangzhen
- *
- */
-public class Convertor{
-       public static void main(String[] args) throws Exception {
-               String paths[] = new String[]{
-                               "./spoon/orig-classes",
-                               "./spoon/spooned1",
-                               "./spoon/spooned2",
-//                             "./spoon/spooned3",
-                               "./spoon/spooned",
-               };
-               int pi = 0;
-               
-               String[] args1 = new String[] {
-                               "--fragments", 
-                               "--output-type", "compilationunits",
-                               "--with-imports",
-                               "-i", paths[pi++],
-                               "-o", paths[pi], "-p", 
-                               "info.fzhen.ode.omodel_conv.FieldAccessorGen"
-                               };
-               Launcher launcher1 = new Launcher();
-               launcher1.setArgs(args1);
-               launcher1.run();
-
-               String[] args2 =  new String[] {
-                               "--fragments", 
-                               "--output-type", "compilationunits",
-                               "--with-imports",
-                               "-i", paths[pi++],
-                               "-o", paths[pi], "-p", 
-                               "info.fzhen.ode.omodel_conv.FieldAssign2Setter"
-                               };
-               Launcher launcher2 = new Launcher();
-               launcher2.setArgs(args2);
-               launcher2.run();
-
-               String[] args3 =  new String[] {
-                               "--fragments", 
-                               "--output-type", "compilationunits",
-                               "--with-imports",
-                               "-i", paths[pi++],
-                               "-o", paths[pi], "-p", 
-                               "info.fzhen.ode.omodel_conv.FieldAcc2Getter"
-                               };
-               Launcher launcher3 = new Launcher();
-               launcher3.setArgs(args3);
-               launcher3.run();
-               
-       }
-}

http://git-wip-us.apache.org/repos/asf/ode/blob/a499545d/omodel-conv/src/main/java/info/fzhen/ode/omodel_conv/FieldAcc2Getter.java
----------------------------------------------------------------------
diff --git 
a/omodel-conv/src/main/java/info/fzhen/ode/omodel_conv/FieldAcc2Getter.java 
b/omodel-conv/src/main/java/info/fzhen/ode/omodel_conv/FieldAcc2Getter.java
deleted file mode 100644
index b38aa07..0000000
--- a/omodel-conv/src/main/java/info/fzhen/ode/omodel_conv/FieldAcc2Getter.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package info.fzhen.ode.omodel_conv;
-
-import org.apache.log4j.BasicConfigurator;
-import org.apache.log4j.Logger;
-
-import spoon.processing.AbstractProcessor;
-import spoon.reflect.code.CtFieldAccess;
-import spoon.reflect.cu.CompilationUnit;
-import spoon.reflect.cu.SourceCodeFragment;
-import spoon.reflect.reference.CtFieldReference;
-
-/**
- * Transform access to a field to it's getter. It doesn't distinguish if it 
should be setter or getter, however.
- * So, the {@link FieldAssign2Setter} should be launched beforehand.
- * @author fangzhen
- *
- */
-public class FieldAcc2Getter extends AbstractProcessor<CtFieldAccess<?>> {
-       public static Logger logger = 
Logger.getLogger(FieldAcc2Getter.class.getName());
-       static{
-               BasicConfigurator.configure();
-       }
-       @Override
-       public void process(CtFieldAccess<?> fAccess) {
-               if (fAccess.getVariable().isStatic()) return;
-//             System.out.println(fAccess + " position " + 
fAccess.getPosition().getSourceStart() + " "  + 
fAccess.getPosition().getSourceEnd());
-               CtFieldReference<?> targeted = fAccess.getVariable();
-               if (targeted.getSimpleName() == "class")return;
-               if 
(targeted.getQualifiedName().startsWith("org.apache.ode.bpel.o.") ||
-                               
targeted.getQualifiedName().startsWith("org.apache.ode.bpel.elang.xpath10.o") ||
-                               
targeted.getQualifiedName().startsWith("org.apache.ode.bpel.elang.xpath20.o") ||
-                               
targeted.getQualifiedName().startsWith("org.apache.ode.bpel.elang.xquery10.o")) 
{
-                       CompilationUnit cu = 
fAccess.getPosition().getCompilationUnit();
-                       SourceCodeFragment fragment = new SourceCodeFragment();
-                       fragment.replacementLength = 
targeted.getSimpleName().length();
-                       fragment.position = 
fAccess.getPosition().getSourceEnd() - fragment.replacementLength + 1;
-                       String vname = fAccess.getVariable().getSimpleName();
-                       if (vname.startsWith("_")) vname = vname.substring(1);
-                       vname = vname.substring(0,1).toUpperCase() + 
vname.substring(1);
-                       String methString = "get";
-                       if 
(targeted.getType().equals(fAccess.getFactory().Type().BOOLEAN_PRIMITIVE) 
-                                       
||targeted.getType().equals(fAccess.getFactory().Type().BOOLEAN)){
-                               methString = "is";
-                       }
-                       fragment.code  = methString + vname + "()";
-                       cu.addSourceCodeFragment(fragment);
-                       logger.info(cu.getFile().getPath() + " Accessed field: 
" + fAccess + "; Generated getter: " + fragment.code);
-               }
-       }
-}

http://git-wip-us.apache.org/repos/asf/ode/blob/a499545d/omodel-conv/src/main/java/info/fzhen/ode/omodel_conv/FieldAccConvertor.java
----------------------------------------------------------------------
diff --git 
a/omodel-conv/src/main/java/info/fzhen/ode/omodel_conv/FieldAccConvertor.java 
b/omodel-conv/src/main/java/info/fzhen/ode/omodel_conv/FieldAccConvertor.java
deleted file mode 100644
index ff019e4..0000000
--- 
a/omodel-conv/src/main/java/info/fzhen/ode/omodel_conv/FieldAccConvertor.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package info.fzhen.ode.omodel_conv;
-
-import spoon.Launcher;
-
-public class FieldAccConvertor {
-       public static void main(String[] args) throws Exception {
-               String paths[] = new String[]{
-                               "./spoon/orig-classes",
-                               "./spoon/spooned1",
-                               "./spoon/spooned2",
-//                             "./spoon/spooned3",
-                               "./spoon/spooned",
-               };
-               int pi = 0;
-               
-               String[] args1 =  new String[] {
-                               "--fragments", 
-                               "--output-type", "compilationunits",
-                               "--with-imports",
-                               "-i", paths[pi++],
-                               "-o", paths[pi], "-p", 
-                               "info.fzhen.ode.omodel_conv.FieldAssign2Setter"
-                               };
-               Launcher launcher1 = new Launcher();
-               launcher1.setArgs(args1);
-               launcher1.run();
-               
-       
-               String[] args2 =  new String[] {
-                               "--fragments", 
-                               "--output-type", "compilationunits",
-                               "--with-imports",
-                               "-i", paths[pi++],
-                               "-o", paths[pi], "-p", 
-                               "info.fzhen.ode.omodel_conv.FieldAcc2Getter"
-                               };
-               Launcher launcher2 = new Launcher();
-               launcher2.setArgs(args2);
-               launcher2.run();
-       }
-}

http://git-wip-us.apache.org/repos/asf/ode/blob/a499545d/omodel-conv/src/main/java/info/fzhen/ode/omodel_conv/FieldAccessorGen.java
----------------------------------------------------------------------
diff --git 
a/omodel-conv/src/main/java/info/fzhen/ode/omodel_conv/FieldAccessorGen.java 
b/omodel-conv/src/main/java/info/fzhen/ode/omodel_conv/FieldAccessorGen.java
deleted file mode 100644
index f2781bc..0000000
--- a/omodel-conv/src/main/java/info/fzhen/ode/omodel_conv/FieldAccessorGen.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package info.fzhen.ode.omodel_conv;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import spoon.processing.AbstractProcessor;
-import spoon.reflect.code.CtExpression;
-import spoon.reflect.cu.CompilationUnit;
-import spoon.reflect.cu.SourceCodeFragment;
-import spoon.reflect.declaration.CtField;
-import spoon.reflect.declaration.ModifierKind;
-import spoon.reflect.reference.CtTypeReference;
-
-/**
- * This class generates three items from a non-private and non-static field:
- * 1. A private final String indicates field name;
- * 2. getter annotated by JsonIgnore.
- * 3. setter
- * The initial expression will be dropped out if existed.
- * @author fangzhen
- *
- */
-public class FieldAccessorGen extends AbstractProcessor<CtField<?>>{
-       private CtField<?> field;
-       private CtTypeReference<?> fieldType;
-       private String fname;
-       private String ofname; //original field name. with _
-       private String cname;
-       private ModifierKind accCtl;
-       private String typeStr;
-       public void process(CtField<?> f) {
-               init(f);
-               generate();
-       }
-       private void init(CtField<?> f) {
-               this.field = f;
-               fieldType = field.getType();
-               ofname = field.getSimpleName();
-               fname = ofname;
-               if (ofname.startsWith("_")) {
-                       fname = fname.substring(1);
-               }
-               cname = fname.toUpperCase();
-               List<CtTypeReference<?>> tas = 
fieldType.getActualTypeArguments();
-               StringBuffer typeStr = new 
StringBuffer(fieldType.getSimpleName());
-               if (tas.size() > 0){
-                       typeStr.append("<");
-                       for (CtTypeReference<?> ta : tas){
-                               typeStr.append(ta.getSimpleName());
-                               typeStr.append(",");
-                       }
-                       typeStr.setCharAt(typeStr.length()-1, '>');
-               }
-               this.typeStr = typeStr.toString();
-               
-               Set<ModifierKind> modifiers = field.getModifiers();
-               if (modifiers.contains(ModifierKind.PUBLIC)) {
-                       accCtl = ModifierKind.PUBLIC;
-               } else if (modifiers.contains(ModifierKind.PROTECTED)) {
-                       accCtl = ModifierKind.PROTECTED;
-               } else if (modifiers.contains(ModifierKind.PRIVATE)) {
-                       accCtl = ModifierKind.PRIVATE;
-               } else {
-                       accCtl = null;
-               }
-       }
-
-       public void generate() {
-               Set<ModifierKind> modifiers = field.getModifiers();
-               if (modifiers.contains(ModifierKind.PRIVATE)) {
-                       return;
-               }
-               if (modifiers.contains(ModifierKind.STATIC)) {
-                       return;
-               }
-               CtExpression<?> initExp = field.getDefaultExpression();
-               CompilationUnit cu = field.getPosition().getCompilationUnit();
-               SourceCodeFragment fragment = new SourceCodeFragment();
-               if (initExp == null){
-                       fragment.position = field.getPosition().getSourceEnd() 
+ 3;
-               }else{
-                       fragment.position = 
initExp.getPosition().getSourceEnd() + 3;
-               }
-               fragment.replacementLength = 0;
-               
-               fragment.code = "\n" + genConstant() + "\n" +  genGetter() + 
"\n" + genSetter() + "\n\n" ;
-               cu.addSourceCodeFragment(fragment);
-       }
-
-       public String genConstant() {           
-               String cfStr = "";
-               cfStr += "private static final String ";
-               cfStr += cname + " = ";
-               cfStr += "\"" + ofname + "\";";
-               return cfStr;
-       }
-
-       public String genSetter() {
-               Set<ModifierKind> modifiers = new HashSet<ModifierKind>();
-               if (accCtl != null) {
-                       modifiers.add(accCtl);
-               }
-               String name = "set" + fname.substring(0, 1).toUpperCase()
-                               + fname.substring(1);
-       
-               String setStr = "";
-               for (ModifierKind m : modifiers){
-                       setStr += m.toString() + " ";
-               }
-               setStr += "void ";
-               setStr +=  name + "(" + typeStr + " " + fname + "){\n";
-               setStr += "fieldContainer.put(" + cname + ", "
-                               + fname + ");\n}";
-               return setStr;
-       }
-
-       public String genGetter() {
-               Set<ModifierKind> modifiers = new HashSet<ModifierKind>();
-               if (accCtl != null) {
-                       modifiers.add(accCtl);
-               }
-               String name = "get" + fname.substring(0, 1).toUpperCase()
-                               + fname.substring(1);
-
-               String getStr = "";
-               getStr += "@JsonIgnore\n";
-               for (ModifierKind m : modifiers){
-                       getStr += m.toString() + " ";
-               }
-               getStr += typeStr + " ";
-               getStr += name + "(){\n";
-               getStr += "return (" + typeStr
-                               + ")fieldContainer.get(" + fname.toUpperCase() 
+ ");\n}";
-               return getStr;
-       }
-
-}

http://git-wip-us.apache.org/repos/asf/ode/blob/a499545d/omodel-conv/src/main/java/info/fzhen/ode/omodel_conv/FieldAssign2Setter.java
----------------------------------------------------------------------
diff --git 
a/omodel-conv/src/main/java/info/fzhen/ode/omodel_conv/FieldAssign2Setter.java 
b/omodel-conv/src/main/java/info/fzhen/ode/omodel_conv/FieldAssign2Setter.java
deleted file mode 100644
index 8818671..0000000
--- 
a/omodel-conv/src/main/java/info/fzhen/ode/omodel_conv/FieldAssign2Setter.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package info.fzhen.ode.omodel_conv;
-
-import org.apache.log4j.BasicConfigurator;
-import org.apache.log4j.Logger;
-
-import spoon.processing.AbstractProcessor;
-import spoon.reflect.code.CtAssignment;
-import spoon.reflect.code.CtExpression;
-import spoon.reflect.code.CtFieldAccess;
-import spoon.reflect.cu.CompilationUnit;
-import spoon.reflect.cu.SourceCodeFragment;
-
-/**
- * Transform a assignment to field to it's setter.
- * @author fangzhen
- *
- */
-public class FieldAssign2Setter extends AbstractProcessor<CtAssignment<?, ?>>{
-       public static Logger logger = 
Logger.getLogger(FieldAssign2Setter.class.getName());
-       static{
-               BasicConfigurator.configure();
-       }
-       @Override
-       public void process(CtAssignment<?, ?> element) {
-//             System.out.println(element);
-               CtExpression<?> assigned = element.getAssigned();
-               if (assigned instanceof CtFieldAccess){
-                       CtFieldAccess<?> fAccess = (CtFieldAccess<?>)assigned;
-//                     if 
(fAccess.getParent((Class)fAccess.getVariable().getDeclaringType().getDeclaration().getClass())
 != null) return;
-                       CtExpression<?> assignment = element.getAssignment();
-                       if (fAccess.getVariable().isStatic()) return;
-                       if 
(fAccess.getVariable().getQualifiedName().startsWith("org.apache.ode.bpel.o.") 
||
-                                       
fAccess.getVariable().getQualifiedName().startsWith("org.apache.ode.bpel.elang.xpath10.o")
 ||
-                                       
fAccess.getVariable().getQualifiedName().startsWith("org.apache.ode.bpel.elang.xpath20.o")
 ||
-                                       
fAccess.getVariable().getQualifiedName().startsWith("org.apache.ode.bpel.elang.xquery10.o"))
 {
-                               CompilationUnit cu = 
fAccess.getPosition().getCompilationUnit();
-                               SourceCodeFragment fragment = new 
SourceCodeFragment();
-                               fragment.position = 
fAccess.getPosition().getSourceEnd() - 
fAccess.getVariable().getSimpleName().length() + 1;
-                               fragment.replacementLength = 
assignment.getPosition().getSourceStart() - fragment.position;
-                               
-                               String vname = 
fAccess.getVariable().getSimpleName();
-                               if (vname.startsWith("_")) vname = 
vname.substring(1);
-                               vname = vname.substring(0,1).toUpperCase() + 
vname.substring(1);
-                               String setter = "set" + vname + "(";
-                               fragment.code = setter;
-                               cu.addSourceCodeFragment(fragment);
-                               
-                               SourceCodeFragment fragment2 = new 
SourceCodeFragment();
-                               fragment2.position = 
assignment.getPosition().getSourceEnd() + 1;
-                               fragment2.replacementLength = 0;
-                               fragment2.code = ")";
-                               cu.addSourceCodeFragment(fragment2);
-                               logger.info(cu.getFile().getPath() + " Accessed 
field: " + fAccess + "; Generated setter: " + setter + ")");
-                       }
-               }
-       }
-
-}

http://git-wip-us.apache.org/repos/asf/ode/blob/a499545d/omodel-conv/src/main/java/log4j.properties
----------------------------------------------------------------------
diff --git a/omodel-conv/src/main/java/log4j.properties 
b/omodel-conv/src/main/java/log4j.properties
deleted file mode 100644
index 18d7c62..0000000
--- a/omodel-conv/src/main/java/log4j.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-### set log levels ###
-log4j.rootLogger = debug, stdout, D
-
-###
-log4j.appender.stdout = org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.Target = System.out
-log4j.appender.stdout.layout = org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern =  %d{ABSOLUTE} %5p %c{1}:%L - 
%m%n
-
-### 
-log4j.appender.D = org.apache.log4j.DailyRollingFileAppender
-log4j.appender.D.File = spoon/log.log
-log4j.appender.D.Append = true
-log4j.appender.D.Threshold = DEBUG
-log4j.appender.D.layout = org.apache.log4j.PatternLayout
-log4j.appender.D.layout.ConversionPattern = %-d{yyyy-MM-dd HH:mm:ss}  [ %t:%r 
] - [ %p ]  %m%n

http://git-wip-us.apache.org/repos/asf/ode/blob/a499545d/omodel-conv/src/sed_insts1
----------------------------------------------------------------------
diff --git a/omodel-conv/src/sed_insts1 b/omodel-conv/src/sed_insts1
deleted file mode 100644
index 2f0f3b5..0000000
--- a/omodel-conv/src/sed_insts1
+++ /dev/null
@@ -1,5 +0,0 @@
-s/org.apache.ode.bpel.o/org.apache.ode.bpel.obj/g
-s/implements Serializable//
-s/@com.fasterxml.jackson.annotation.JsonIgnore/@JsonIgnore/
-0,/^import/{s/^import/import 
com.fasterxml.jackson.annotation.JsonIgnore\;\nimport/}
-/serialVersionUID/d

http://git-wip-us.apache.org/repos/asf/ode/blob/a499545d/omodel-conv/src/sed_insts2
----------------------------------------------------------------------
diff --git a/omodel-conv/src/sed_insts2 b/omodel-conv/src/sed_insts2
deleted file mode 100644
index 98b264b..0000000
--- a/omodel-conv/src/sed_insts2
+++ /dev/null
@@ -1,4 +0,0 @@
-s/org.apache.ode.bpel.o/org.apache.ode.bpel.obj/g
-s/org.apache.ode.bpel.elang.xpath10.o/org.apache.ode.bpel.elang.xpath10.obj/g
-s/org.apache.ode.bpel.elang.xpath20.o/org.apache.ode.bpel.elang.xpath20.obj/g
-s/org.apache.ode.bpel.elang.xquery10.o/org.apache.ode.bpel.elang.xquery10.obj/g
\ No newline at end of file

Reply via email to