felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r563084 - in /felix/sandbox/cziegeler/maven-scr-plugin/src/main/java/org/apache/felix/sandbox/scrplugin: om/AbstractObject.java xml/ComponentDescriptorIO.java
Date Mon, 06 Aug 2007 10:04:06 GMT
Author: cziegeler
Date: Mon Aug  6 03:04:01 2007
New Revision: 563084

URL: http://svn.apache.org/viewvc?view=rev&rev=563084
Log:
Correct mapping for references, services and interfaces.

Modified:
    felix/sandbox/cziegeler/maven-scr-plugin/src/main/java/org/apache/felix/sandbox/scrplugin/om/AbstractObject.java
    felix/sandbox/cziegeler/maven-scr-plugin/src/main/java/org/apache/felix/sandbox/scrplugin/xml/ComponentDescriptorIO.java

Modified: felix/sandbox/cziegeler/maven-scr-plugin/src/main/java/org/apache/felix/sandbox/scrplugin/om/AbstractObject.java
URL: http://svn.apache.org/viewvc/felix/sandbox/cziegeler/maven-scr-plugin/src/main/java/org/apache/felix/sandbox/scrplugin/om/AbstractObject.java?view=diff&rev=563084&r1=563083&r2=563084
==============================================================================
--- felix/sandbox/cziegeler/maven-scr-plugin/src/main/java/org/apache/felix/sandbox/scrplugin/om/AbstractObject.java
(original)
+++ felix/sandbox/cziegeler/maven-scr-plugin/src/main/java/org/apache/felix/sandbox/scrplugin/om/AbstractObject.java
Mon Aug  6 03:04:01 2007
@@ -24,7 +24,7 @@
  * The <code>AbstractObject</code>
  * is the base class for the all classes of the scr om.
  */
-abstract class AbstractObject {
+public abstract class AbstractObject {
 
     protected final JavaTag tag;
 

Modified: felix/sandbox/cziegeler/maven-scr-plugin/src/main/java/org/apache/felix/sandbox/scrplugin/xml/ComponentDescriptorIO.java
URL: http://svn.apache.org/viewvc/felix/sandbox/cziegeler/maven-scr-plugin/src/main/java/org/apache/felix/sandbox/scrplugin/xml/ComponentDescriptorIO.java?view=diff&rev=563084&r1=563083&r2=563084
==============================================================================
--- felix/sandbox/cziegeler/maven-scr-plugin/src/main/java/org/apache/felix/sandbox/scrplugin/xml/ComponentDescriptorIO.java
(original)
+++ felix/sandbox/cziegeler/maven-scr-plugin/src/main/java/org/apache/felix/sandbox/scrplugin/xml/ComponentDescriptorIO.java
Mon Aug  6 03:04:01 2007
@@ -52,14 +52,17 @@
         this.xstream = new XStream();
         this.xstream.setMode(XStream.NO_REFERENCES);
 
+        this.xstream.omitField(org.apache.felix.sandbox.scrplugin.om.AbstractObject.class,
"tag");
+
         this.xstream.alias("components", org.apache.felix.sandbox.scrplugin.om.Components.class);
         this.xstream.addImplicitCollection(org.apache.felix.sandbox.scrplugin.om.Components.class,
"components");
 
         this.xstream.alias("component", org.apache.felix.sandbox.scrplugin.om.Component.class);
+        this.xstream.addImplicitCollection(org.apache.felix.sandbox.scrplugin.om.Component.class,
"references");
+        this.xstream.addImplicitCollection(org.apache.felix.sandbox.scrplugin.om.Component.class,
"properties");
         this.xstream.useAttributeFor(org.apache.felix.sandbox.scrplugin.om.Component.class,
"name");
         this.xstream.useAttributeFor(org.apache.felix.sandbox.scrplugin.om.Component.class,
"enabled");
         this.xstream.useAttributeFor(org.apache.felix.sandbox.scrplugin.om.Component.class,
"immediate");
-        this.xstream.omitField(org.apache.felix.sandbox.scrplugin.om.Component.class, "tag");
         this.xstream.omitField(org.apache.felix.sandbox.scrplugin.om.Component.class, "label");
         this.xstream.omitField(org.apache.felix.sandbox.scrplugin.om.Component.class, "description");
         this.xstream.omitField(org.apache.felix.sandbox.scrplugin.om.Component.class, "isAbstract");
@@ -72,18 +75,17 @@
         this.xstream.alias("property", org.apache.felix.sandbox.scrplugin.om.Property.class);
         this.xstream.useAttributeFor(org.apache.felix.sandbox.scrplugin.om.Property.class,
"name");
         this.xstream.useAttributeFor(org.apache.felix.sandbox.scrplugin.om.Property.class,
"value");
-        this.xstream.omitField(org.apache.felix.sandbox.scrplugin.om.Property.class, "tag");
         this.xstream.omitField(org.apache.felix.sandbox.scrplugin.om.Property.class, "label");
         this.xstream.omitField(org.apache.felix.sandbox.scrplugin.om.Property.class, "description");
         this.xstream.omitField(org.apache.felix.sandbox.scrplugin.om.Property.class, "options");
         this.xstream.omitField(org.apache.felix.sandbox.scrplugin.om.Property.class, "privateProperty");
 
         this.xstream.alias("service", org.apache.felix.sandbox.scrplugin.om.Service.class);
+        this.xstream.addImplicitCollection(org.apache.felix.sandbox.scrplugin.om.Service.class,
"interfaces");
         this.xstream.useAttributeFor(org.apache.felix.sandbox.scrplugin.om.Service.class,
"servicefactory");
 
         this.xstream.alias("provide", org.apache.felix.sandbox.scrplugin.om.Interface.class);
         this.xstream.useAttributeFor(org.apache.felix.sandbox.scrplugin.om.Interface.class,
"interfacename");
-        this.xstream.omitField(org.apache.felix.sandbox.scrplugin.om.Interface.class, "tag");
 
         this.xstream.alias("reference", org.apache.felix.sandbox.scrplugin.om.Reference.class);
         this.xstream.useAttributeFor(org.apache.felix.sandbox.scrplugin.om.Reference.class,
"name");
@@ -93,7 +95,6 @@
         this.xstream.useAttributeFor(org.apache.felix.sandbox.scrplugin.om.Reference.class,
"policy");
         this.xstream.useAttributeFor(org.apache.felix.sandbox.scrplugin.om.Reference.class,
"bind");
         this.xstream.useAttributeFor(org.apache.felix.sandbox.scrplugin.om.Reference.class,
"unbind");
-        this.xstream.omitField(org.apache.felix.sandbox.scrplugin.om.Reference.class, "tag");
     }
 
     public org.apache.felix.sandbox.scrplugin.om.Components read(File file) throws IOException,
MojoExecutionException {



Mime
View raw message