felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clem...@apache.org
Subject svn commit: r1480678 - in /felix/trunk/ipojo/manipulator/ipojo-ant-task: pom.xml src/main/java/org/apache/felix/ipojo/task/IPojoTask.java src/main/java/org/apache/felix/ipojo/task/IPojoc.java
Date Thu, 09 May 2013 15:09:43 GMT
Author: clement
Date: Thu May  9 15:09:43 2013
New Revision: 1480678

URL: http://svn.apache.org/r1480678
Log:
Fix FELIX-4059 - https://issues.apache.org/jira/browse/FELIX-4059
Provide a simple too to manipulate iPOJO bundles

Added:
    felix/trunk/ipojo/manipulator/ipojo-ant-task/src/main/java/org/apache/felix/ipojo/task/IPojoc.java
Modified:
    felix/trunk/ipojo/manipulator/ipojo-ant-task/pom.xml
    felix/trunk/ipojo/manipulator/ipojo-ant-task/src/main/java/org/apache/felix/ipojo/task/IPojoTask.java

Modified: felix/trunk/ipojo/manipulator/ipojo-ant-task/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/ipojo-ant-task/pom.xml?rev=1480678&r1=1480677&r2=1480678&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/ipojo-ant-task/pom.xml (original)
+++ felix/trunk/ipojo/manipulator/ipojo-ant-task/pom.xml Thu May  9 15:09:43 2013
@@ -59,6 +59,11 @@
             <artifactId>ant</artifactId>
             <version>1.6.5</version>
         </dependency>
+        <dependency>
+            <groupId>commons-cli</groupId>
+            <artifactId>commons-cli</artifactId>
+            <version>1.2</version>
+        </dependency>
     </dependencies>
     <build>
         <resources>
@@ -92,9 +97,12 @@
                             org.objectweb.asm.tree;-split-package:=merge-first,
                             org.apache.xerces.parsers, org.apache.xerces.xni*,
                             org.apache.xerces.impl*, org.apache.xerces.util.*,
-                            org.apache.xerces.dom.*, org.apache.xerces.dom3.*
+                            org.apache.xerces.dom.*, org.apache.xerces.dom3.*,
+                            <!-- commons-cli  -->
+                            org.apache.commons.cli
                         </Private-Package>
                         <Export-Package>org.apache.felix.ipojo.task</Export-Package>
+                        <Main-Class>org.apache.felix.ipojo.task.IPojoc</Main-Class>
                     </instructions>
                     <obrRepository>NONE</obrRepository>
                 </configuration>

Modified: felix/trunk/ipojo/manipulator/ipojo-ant-task/src/main/java/org/apache/felix/ipojo/task/IPojoTask.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/ipojo-ant-task/src/main/java/org/apache/felix/ipojo/task/IPojoTask.java?rev=1480678&r1=1480677&r2=1480678&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/ipojo-ant-task/src/main/java/org/apache/felix/ipojo/task/IPojoTask.java
(original)
+++ felix/trunk/ipojo/manipulator/ipojo-ant-task/src/main/java/org/apache/felix/ipojo/task/IPojoTask.java
Thu May  9 15:09:43 2013
@@ -52,7 +52,7 @@ public class IPojoTask extends Task {
 
     /**
      * Flag describing if we need or not use local XSD files
-     * (i.e. use the {@link SchemaResolver} or not).
+     * (i.e. use the {@link org.apache.felix.ipojo.xml.parser.SchemaResolver} or not).
      * If <code>true</code> the local XSD are not used.
      */
     private boolean m_ignoreLocalXSD = false;

Added: felix/trunk/ipojo/manipulator/ipojo-ant-task/src/main/java/org/apache/felix/ipojo/task/IPojoc.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/ipojo-ant-task/src/main/java/org/apache/felix/ipojo/task/IPojoc.java?rev=1480678&view=auto
==============================================================================
--- felix/trunk/ipojo/manipulator/ipojo-ant-task/src/main/java/org/apache/felix/ipojo/task/IPojoc.java
(added)
+++ felix/trunk/ipojo/manipulator/ipojo-ant-task/src/main/java/org/apache/felix/ipojo/task/IPojoc.java
Thu May  9 15:09:43 2013
@@ -0,0 +1,214 @@
+/*
+ * 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.felix.ipojo.task;
+
+import org.apache.commons.cli.*;
+import org.apache.felix.ipojo.manipulator.Pojoization;
+
+import java.io.File;
+import java.util.List;
+
+/**
+ * A command line tools to manipulate iPOJO bundles.
+ * It case be used as follow:
+ * <code>java -jar this-jar.jar --input the-jar-to-manipulate</code><br/>
+ * <code>java -jar this-jar.jar --input the-jar-to-manipulate  --output the-output-jar</code><br/>
+ * <code>java -jar this-jar.jar --input the-jar-to-manipulate  --metadata the-xml-metadata</code><br/>
+ */
+public class IPojoc {
+
+    /**
+     * CLI options.
+     */
+    private static Options options;
+
+    /**
+     * The main entry point
+     * @param args the arguments
+     * @throws ParseException
+     */
+    public static void main(String[] args) throws ParseException {
+        options = getOptions();
+        CommandLineParser parser = new GnuParser();
+        try {
+            CommandLine cmd = parser.parse(options, args);
+            if (cmd.hasOption("h")) {
+                printHelp();
+            } else {
+                process(cmd);
+            }
+        } catch (MissingOptionException e) {
+            for (String opt : (List<String>) e.getMissingOptions()) {
+                System.err.println("The '" + opt + "' option is missing");
+            }
+            printHelp();
+        } catch (MissingArgumentException e) {
+            System.err.println("The option '" + e.getOption() + "' requires an argument");
+            printHelp();
+        }
+    }
+
+    /**
+     * The command line is valid, to processing the command line.
+     * @param cmd the command line
+     * @throws ParseException
+     */
+    private static void process(CommandLine cmd) throws ParseException {
+        // All arguments are set
+        File input, output, metadata;
+
+        // Check that the input file exist
+        try {
+            input = (File) cmd.getParsedOptionValue("i");
+            if (input == null || !input.isFile()) {
+                System.err.println("The input option must be an existing file, '" + cmd.getOptionValue('i')
+ "' does " +
+                        "not exist");
+                return;
+            }
+        } catch (ParseException pe) {
+            System.err.println("The input option must be an existing file");
+            return;
+        }
+
+        // Retrieve output file
+        if (cmd.hasOption("o")) {
+            try {
+                output = (File) cmd.getParsedOptionValue("o");
+            } catch (ParseException pe) {
+                System.err.println("The output option must be a valid file");
+                return;
+            }
+        } else {
+            // Inline replacement
+            // We create a temporary file marked by a __ prefix
+            // It will be substituted upon success.
+            output = new File("__" + input.getName());
+        }
+
+        // Retrieve the metadata file
+        if (cmd.hasOption("m")) {
+            try {
+                metadata = (File) cmd.getParsedOptionValue("m");
+                if (metadata != null && !metadata.isFile()) {
+                    System.err.println("The metadata option must be an existing file , "
+
+                            "'" + cmd.getOptionValue('m') + "' does " +
+                            "not exist");
+                    return;
+                }
+            } catch (ParseException pe) {
+                System.err.println("The metadata option must be a valid file");
+                return;
+            }
+        } else {
+            metadata = null;
+        }
+
+        System.out.println("iPOJO Manipulation:");
+        System.out.println("input file     => " + input.getAbsolutePath());
+        if (output.getName().startsWith("__")) {
+            System.out.println("output file    => " + input.getAbsolutePath());
+        } else {
+            System.out.println("output file    => " + output.getAbsolutePath());
+        }
+        if (metadata != null) {
+            System.out.println("metadata file  => " + metadata.getAbsolutePath());
+        } else {
+            System.out.println("metadata file  => no metadata file");
+        }
+
+        Pojoization pojoization = new Pojoization();
+        pojoization.pojoization(input, output, metadata);
+
+        if (pojoization.getErrors().size() != 0) {
+            System.err.println("iPOJO Manipulation failed :");
+            for (String error : pojoization.getErrors()) {
+                System.err.println("\t" +error);
+            }
+            System.exit(-1);
+        } else {
+            System.err.println("iPOJO Manipulation successfully completed.");
+            for (String warning : pojoization.getWarnings()) {
+                System.err.println(warning);
+            }
+            cleanup(input, output);
+            System.exit(0);
+        }
+    }
+
+    /**
+     * Upon success, cleanup temporary files.
+     * @param input the input jar
+     * @param output the output jar
+     */
+    private static void cleanup(File input, File output) {
+        if (output.getName().startsWith("__")) {
+            input.delete();
+            output.renameTo(input);
+        }
+    }
+
+    /**
+     * Print help.
+     */
+    private static void printHelp() {
+        HelpFormatter formatter = new HelpFormatter();
+        formatter.printHelp("ipojoc", options);
+    }
+
+    /**
+     * Builds the option list
+     * @return the options
+     */
+    public static Options getOptions() {
+        Option input =
+                OptionBuilder.withArgName("input file")
+                        .withLongOpt("input")
+                        .hasArg()
+                        .withDescription("the input jar file")
+                        .isRequired(true)
+                        .withType(File.class)
+                        .create('i');
+
+        Option output =
+                OptionBuilder
+                        .withLongOpt("output")
+                        .withArgName("output file")
+                        .hasArg()
+                        .withDescription("the output jar file, if not set the manipulation
replace the input file")
+                        .isRequired(false)
+                        .withType(File.class)
+                        .create('o');
+
+        Option metadata =
+                OptionBuilder
+                        .withLongOpt("metadata")
+                        .withArgName("metadata file")
+                        .hasArg()
+                        .withDescription("the XML metadata file")
+                        .isRequired(false)
+                        .withType(File.class)
+                        .create('m');
+
+        Option help =
+                OptionBuilder.withLongOpt("help").withDescription("print this message").create('h');
+
+        return new Options().addOption(input).addOption(output).addOption(metadata).addOption(help);
+    }
+}



Mime
View raw message