Return-Path: Delivered-To: apmail-felix-commits-archive@www.apache.org Received: (qmail 26444 invoked from network); 7 Jul 2009 07:22:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 7 Jul 2009 07:22:46 -0000 Received: (qmail 83968 invoked by uid 500); 7 Jul 2009 07:22:56 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 83893 invoked by uid 500); 7 Jul 2009 07:22:55 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 83884 invoked by uid 99); 7 Jul 2009 07:22:55 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Jul 2009 07:22:55 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Jul 2009 07:22:51 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id ED84723888C5; Tue, 7 Jul 2009 07:22:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r791729 - in /felix/trunk/ipojo: ./ ant/src/main/java/org/apache/felix/ipojo/task/ composite/src/main/java/org/apache/felix/ipojo/composite/ core/src/main/java/org/apache/felix/ipojo/ core/src/main/java/org/apache/felix/ipojo/architecture/ ... Date: Tue, 07 Jul 2009 07:22:29 -0000 To: commits@felix.apache.org From: clement@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090707072229.ED84723888C5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: clement Date: Tue Jul 7 07:22:28 2009 New Revision: 791729 URL: http://svn.apache.org/viewvc?rev=791729&view=rev Log: Fix issue FELIX-1302. The ignoreAnnotation argument was ignored. Some cosmetic bugs in preparation to the next release. Modified: felix/trunk/ipojo/ant/src/main/java/org/apache/felix/ipojo/task/IPojoTask.java felix/trunk/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/FactoryProxy.java felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/ComponentFactory.java felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/Factory.java felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/IPojoFactory.java felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/InstanceCreator.java felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/architecture/ComponentTypeDescription.java felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/configuration/ConfigurationHandler.java felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedService.java felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/parser/ManifestMetadataParser.java felix/trunk/ipojo/handler/extender/src/main/java/org/apache/felix/ipojo/handler/extender/BundleTracker.java felix/trunk/ipojo/handler/transaction/pom.xml felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulator/Pojoization.java felix/trunk/ipojo/plugin/src/main/java/org/apache/felix/ipojo/plugin/ManipulatorMojo.java felix/trunk/ipojo/pom.xml felix/trunk/ipojo/webconsole-plugin/pom.xml felix/trunk/ipojo/webconsole-plugin/src/main/java/org/apache/felix/org/apache/felix/ipojo/webconsole/IPOJOServlet.java Modified: felix/trunk/ipojo/ant/src/main/java/org/apache/felix/ipojo/task/IPojoTask.java URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/ant/src/main/java/org/apache/felix/ipojo/task/IPojoTask.java?rev=791729&r1=791728&r2=791729&view=diff ============================================================================== --- felix/trunk/ipojo/ant/src/main/java/org/apache/felix/ipojo/task/IPojoTask.java (original) +++ felix/trunk/ipojo/ant/src/main/java/org/apache/felix/ipojo/task/IPojoTask.java Tue Jul 7 07:22:28 2009 @@ -1,4 +1,4 @@ -/* +/* * 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 @@ -189,8 +189,8 @@ } Pojoization pojo = new Pojoization(); - if (! m_ignoreAnnotations) { - pojo.setAnnotationProcessing(); + if (m_ignoreAnnotations) { + pojo.disableAnnotationProcessing(); } if (! m_ignoreLocalXSD) { pojo.setUseLocalXSD(); @@ -198,7 +198,7 @@ if (m_input != null) { pojo.pojoization(m_input, m_output, m_metadata); } else { - pojo.directoryPojoization(m_directory,m_metadata, m_manifest); + pojo.directoryPojoization(m_directory, m_metadata, m_manifest); } for (int i = 0; i < pojo.getWarnings().size(); i++) { log((String) pojo.getWarnings().get(i), Project.MSG_WARN); Modified: felix/trunk/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/FactoryProxy.java URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/FactoryProxy.java?rev=791729&r1=791728&r2=791729&view=diff ============================================================================== --- felix/trunk/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/FactoryProxy.java (original) +++ felix/trunk/ipojo/composite/src/main/java/org/apache/felix/ipojo/composite/FactoryProxy.java Tue Jul 7 07:22:28 2009 @@ -1,4 +1,4 @@ -/* +/* * 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 Modified: felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/ComponentFactory.java URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/ComponentFactory.java?rev=791729&r1=791728&r2=791729&view=diff ============================================================================== --- felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/ComponentFactory.java (original) +++ felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/ComponentFactory.java Tue Jul 7 07:22:28 2009 @@ -1,4 +1,4 @@ -/* +/* * 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 @@ -400,8 +400,8 @@ } /** - * Gets the version of the component type - * @return the version of null if not set. + * Gets the version of the component type. + * @return the version of null if not set. * @see org.apache.felix.ipojo.Factory#getVersion() */ public String getVersion() { Modified: felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/Factory.java URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/Factory.java?rev=791729&r1=791728&r2=791729&view=diff ============================================================================== --- felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/Factory.java (original) +++ felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/Factory.java Tue Jul 7 07:22:28 2009 @@ -1,4 +1,4 @@ -/* +/* * 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 Modified: felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/IPojoFactory.java URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/IPojoFactory.java?rev=791729&r1=791728&r2=791729&view=diff ============================================================================== --- felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/IPojoFactory.java (original) +++ felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/IPojoFactory.java Tue Jul 7 07:22:28 2009 @@ -1,4 +1,4 @@ -/* +/* * 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 Modified: felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/InstanceCreator.java URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/InstanceCreator.java?rev=791729&r1=791728&r2=791729&view=diff ============================================================================== --- felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/InstanceCreator.java (original) +++ felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/InstanceCreator.java Tue Jul 7 07:22:28 2009 @@ -1,4 +1,4 @@ -/* +/* * 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 Modified: felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/architecture/ComponentTypeDescription.java URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/architecture/ComponentTypeDescription.java?rev=791729&r1=791728&r2=791729&view=diff ============================================================================== --- felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/architecture/ComponentTypeDescription.java (original) +++ felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/architecture/ComponentTypeDescription.java Tue Jul 7 07:22:28 2009 @@ -1,4 +1,4 @@ -/* +/* * 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 Modified: felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/configuration/ConfigurationHandler.java URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/configuration/ConfigurationHandler.java?rev=791729&r1=791728&r2=791729&view=diff ============================================================================== --- felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/configuration/ConfigurationHandler.java (original) +++ felix/trunk/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/configuration/ConfigurationHandler.java Tue Jul 7 07:22:28 2009 @@ -1,4 +1,4 @@ -/* +/* * 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 @@ -26,7 +26,6 @@ import org.apache.felix.ipojo.ConfigurationException; import org.apache.felix.ipojo.HandlerFactory; -import org.apache.felix.ipojo.InstanceManager; import org.apache.felix.ipojo.PrimitiveHandler; import org.apache.felix.ipojo.architecture.ComponentTypeDescription; import org.apache.felix.ipojo.architecture.HandlerDescription; @@ -455,7 +454,7 @@ return; } Properties props = new Properties(); - for (int i = 0; i 4.0.0 bundle org.apache.felix - org.apache.felix.ipojo.handler.transaction + org.apache.felix.ipojo.handler.transaction + 1.3.0-SNAPSHOT Apache Felix iPOJO Transaction Handler @@ -15,50 +16,82 @@ true - ${pom.artifactId} - org.apache.felix.ipojo.transaction + ${pom.artifactId} + + org.apache.felix.ipojo.transaction + * - org.apache.felix - maven-ipojo-plugin - ${pom.version} - - - - ipojo-bundle - + org.apache.felix + maven-ipojo-plugin + ${pom.version} + + + + ipojo-bundle + - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - + org.apache.maven.plugins + maven-compiler-plugin + + 1.5 + 1.5 + + + + org.codehaus.mojo + rat-maven-plugin + + false + true + true + + doc/**/* + maven-eclipse.xml + .checkstyle + .externalToolBuilders/* + LICENSE.asm + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + + false + warning + + http://felix.apache.org/ipojo/dev/checkstyle_ipojo.xml + + + - - org.apache.felix - org.apache.felix.ipojo - ${pom.version} - - - org.apache.felix - org.apache.felix.ipojo.metadata - ${pom.version} - - - org.apache.felix - org.apache.felix.transaction - 0.9.0-SNAPSHOT - + + org.apache.felix + org.apache.felix.ipojo + ${pom.version} + + + org.apache.felix + org.apache.felix.ipojo.metadata + + ${pom.version} + + + org.apache.felix + org.apache.felix.transaction + + 0.9.0-SNAPSHOT + Modified: felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulator/Pojoization.java URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulator/Pojoization.java?rev=791729&r1=791728&r2=791729&view=diff ============================================================================== --- felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulator/Pojoization.java (original) +++ felix/trunk/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulator/Pojoization.java Tue Jul 7 07:22:28 2009 @@ -1,4 +1,4 @@ -/* +/* * 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 @@ -100,6 +100,7 @@ /** * Flag describing if we need or not compute annotations. + * By default, compute the annotations. */ private boolean m_ignoreAnnotations; @@ -149,8 +150,8 @@ /** * Activates annotation processing. */ - public void setAnnotationProcessing() { - m_ignoreAnnotations = false; + public void disableAnnotationProcessing() { + m_ignoreAnnotations = true; } /** Modified: felix/trunk/ipojo/plugin/src/main/java/org/apache/felix/ipojo/plugin/ManipulatorMojo.java URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/plugin/src/main/java/org/apache/felix/ipojo/plugin/ManipulatorMojo.java?rev=791729&r1=791728&r2=791729&view=diff ============================================================================== --- felix/trunk/ipojo/plugin/src/main/java/org/apache/felix/ipojo/plugin/ManipulatorMojo.java (original) +++ felix/trunk/ipojo/plugin/src/main/java/org/apache/felix/ipojo/plugin/ManipulatorMojo.java Tue Jul 7 07:22:28 2009 @@ -1,4 +1,4 @@ -/* +/* * 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 @@ -189,7 +189,7 @@ File out = new File(m_buildDirectory + File.separator + "_out.jar"); Pojoization pojo = new Pojoization(); - if (!m_ignoreAnnotations) { pojo.setAnnotationProcessing(); } + if (m_ignoreAnnotations) { pojo.disableAnnotationProcessing(); } if (!m_ignoreEmbeddedXSD) { pojo.setUseLocalXSD(); } // Executes the pojoization. Modified: felix/trunk/ipojo/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/pom.xml?rev=791729&r1=791728&r2=791729&view=diff ============================================================================== --- felix/trunk/ipojo/pom.xml (original) +++ felix/trunk/ipojo/pom.xml Tue Jul 7 07:22:28 2009 @@ -43,10 +43,10 @@ handler/temporal handler/eventadmin handler/whiteboard - handler/transaction + api online-manipulator - junit4osgi + Modified: felix/trunk/ipojo/webconsole-plugin/pom.xml URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/webconsole-plugin/pom.xml?rev=791729&r1=791728&r2=791729&view=diff ============================================================================== --- felix/trunk/ipojo/webconsole-plugin/pom.xml (original) +++ felix/trunk/ipojo/webconsole-plugin/pom.xml Tue Jul 7 07:22:28 2009 @@ -1,83 +1,108 @@ - 4.0.0 - bundle - org.apache.felix - org.apache.felix.ipojo.webconsole - 1.3.0-SNAPSHOT - iPOJO WebConsole Plugins + 4.0.0 + bundle + org.apache.felix + org.apache.felix.ipojo.webconsole + 1.3.0-SNAPSHOT + Apche Felix iPOJO WebConsole Plugins - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - - - - org.apache.felix - maven-bundle-plugin - 1.4.3 - true - - - ${pom.artifactId} - - - org.apache.felix.org.apache.felix.ipojo.webconsole - - * - - - - - org.apache.felix - maven-ipojo-plugin - - - - ipojo-bundle - - - - - - - - - org.apache.felix - org.apache.felix.webconsole - 1.2.11-SNAPSHOT - - - org.apache.felix - org.apache.felix.ipojo - ${pom.version} - - - org.apache.felix - org.apache.felix.ipojo.annotations - ${pom.version} - - + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.5 + 1.5 + + + + org.apache.felix + maven-bundle-plugin + 1.4.3 + true + + + ${pom.artifactId} + + + org.apache.felix.org.apache.felix.ipojo.webconsole + + * + + + + + org.apache.felix + maven-ipojo-plugin + + + + ipojo-bundle + + + + + + org.codehaus.mojo + rat-maven-plugin + + false + true + true + + doc/* + maven-eclipse.xml + .checkstyle + .externalToolBuilders/* + LICENSE.asm + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + + false + warning + http://felix.apache.org/ipojo/dev/checkstyle_ipojo.xml + + + + + + + org.apache.felix + org.apache.felix.webconsole + 1.2.11-SNAPSHOT + + + org.apache.felix + org.apache.felix.ipojo + ${pom.version} + + + org.apache.felix + org.apache.felix.ipojo.annotations + ${pom.version} + + Modified: felix/trunk/ipojo/webconsole-plugin/src/main/java/org/apache/felix/org/apache/felix/ipojo/webconsole/IPOJOServlet.java URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/webconsole-plugin/src/main/java/org/apache/felix/org/apache/felix/ipojo/webconsole/IPOJOServlet.java?rev=791729&r1=791728&r2=791729&view=diff ============================================================================== --- felix/trunk/ipojo/webconsole-plugin/src/main/java/org/apache/felix/org/apache/felix/ipojo/webconsole/IPOJOServlet.java (original) +++ felix/trunk/ipojo/webconsole-plugin/src/main/java/org/apache/felix/org/apache/felix/ipojo/webconsole/IPOJOServlet.java Tue Jul 7 07:22:28 2009 @@ -1,4 +1,4 @@ -/* +/* * 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