You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ri...@apache.org on 2006/06/22 14:56:54 UTC
svn commit: r416355 - in /incubator/felix/trunk:
org.apache.felix.ipojo.arch/src/main/java/org/apache/felix/ipojo/arch/
org.apache.felix.ipojo.metadata/src/main/java/org/apache/felix/ipojo/metadata/
org.apache.felix.ipojo.plugin/src/main/java/org/apach...
Author: rickhall
Date: Thu Jun 22 05:56:53 2006
New Revision: 416355
URL: http://svn.apache.org/viewvc?rev=416355&view=rev
Log:
Modified author tags. Renamed one class.
Added:
incubator/felix/trunk/org.apache.felix.ipojo.plugin/src/main/java/org/apache/felix/ipojo/plugin/IPojoPluginConfiguration.java
- copied, changed from r416313, incubator/felix/trunk/org.apache.felix.ipojo.plugin/src/main/java/org/apache/felix/ipojo/plugin/IpojoPluginConfiguration.java
Removed:
incubator/felix/trunk/org.apache.felix.ipojo.plugin/src/main/java/org/apache/felix/ipojo/plugin/IpojoPluginConfiguration.java
Modified:
incubator/felix/trunk/org.apache.felix.ipojo.arch/src/main/java/org/apache/felix/ipojo/arch/ArchCommandImpl.java
incubator/felix/trunk/org.apache.felix.ipojo.metadata/src/main/java/org/apache/felix/ipojo/metadata/Attribute.java
incubator/felix/trunk/org.apache.felix.ipojo.metadata/src/main/java/org/apache/felix/ipojo/metadata/Element.java
incubator/felix/trunk/org.apache.felix.ipojo.plugin/src/main/java/org/apache/felix/ipojo/manipulation/ManipulationProperty.java
incubator/felix/trunk/org.apache.felix.ipojo.plugin/src/main/java/org/apache/felix/ipojo/manipulation/Manipulator.java
incubator/felix/trunk/org.apache.felix.ipojo.plugin/src/main/java/org/apache/felix/ipojo/manipulation/PreprocessClassAdapter.java
incubator/felix/trunk/org.apache.felix.ipojo.plugin/src/main/java/org/apache/felix/ipojo/manipulation/PreprocessCodeAdapter.java
incubator/felix/trunk/org.apache.felix.ipojo.plugin/src/main/java/org/apache/felix/ipojo/parser/ManifestMetadataParser.java
incubator/felix/trunk/org.apache.felix.ipojo.plugin/src/main/java/org/apache/felix/ipojo/parser/ParseException.java
incubator/felix/trunk/org.apache.felix.ipojo.plugin/src/main/java/org/apache/felix/ipojo/parser/XMLMetadataParser.java
Modified: incubator/felix/trunk/org.apache.felix.ipojo.arch/src/main/java/org/apache/felix/ipojo/arch/ArchCommandImpl.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.apache.felix.ipojo.arch/src/main/java/org/apache/felix/ipojo/arch/ArchCommandImpl.java?rev=416355&r1=416354&r2=416355&view=diff
==============================================================================
--- incubator/felix/trunk/org.apache.felix.ipojo.arch/src/main/java/org/apache/felix/ipojo/arch/ArchCommandImpl.java (original)
+++ incubator/felix/trunk/org.apache.felix.ipojo.arch/src/main/java/org/apache/felix/ipojo/arch/ArchCommandImpl.java Thu Jun 22 05:56:53 2006
@@ -31,8 +31,8 @@
/**
- * Implementation of the archi command printing the actual architecture.
- * @author Clement Escoffier
+ * Implementation of the arch command printing the actual architecture.
+ * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
*/
public class ArchCommandImpl implements Command {
Modified: incubator/felix/trunk/org.apache.felix.ipojo.metadata/src/main/java/org/apache/felix/ipojo/metadata/Attribute.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.apache.felix.ipojo.metadata/src/main/java/org/apache/felix/ipojo/metadata/Attribute.java?rev=416355&r1=416354&r2=416355&view=diff
==============================================================================
--- incubator/felix/trunk/org.apache.felix.ipojo.metadata/src/main/java/org/apache/felix/ipojo/metadata/Attribute.java (original)
+++ incubator/felix/trunk/org.apache.felix.ipojo.metadata/src/main/java/org/apache/felix/ipojo/metadata/Attribute.java Thu Jun 22 05:56:53 2006
@@ -18,7 +18,7 @@
/**
* Attribute.
- * @author Clement Escoffier
+ * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
*/
public class Attribute {
Modified: incubator/felix/trunk/org.apache.felix.ipojo.metadata/src/main/java/org/apache/felix/ipojo/metadata/Element.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.apache.felix.ipojo.metadata/src/main/java/org/apache/felix/ipojo/metadata/Element.java?rev=416355&r1=416354&r2=416355&view=diff
==============================================================================
--- incubator/felix/trunk/org.apache.felix.ipojo.metadata/src/main/java/org/apache/felix/ipojo/metadata/Element.java (original)
+++ incubator/felix/trunk/org.apache.felix.ipojo.metadata/src/main/java/org/apache/felix/ipojo/metadata/Element.java Thu Jun 22 05:56:53 2006
@@ -18,7 +18,7 @@
/**
* Element.
- * @author Clement Escoffier
+ * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
*/
public class Element {
Modified: incubator/felix/trunk/org.apache.felix.ipojo.plugin/src/main/java/org/apache/felix/ipojo/manipulation/ManipulationProperty.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.apache.felix.ipojo.plugin/src/main/java/org/apache/felix/ipojo/manipulation/ManipulationProperty.java?rev=416355&r1=416354&r2=416355&view=diff
==============================================================================
--- incubator/felix/trunk/org.apache.felix.ipojo.plugin/src/main/java/org/apache/felix/ipojo/manipulation/ManipulationProperty.java (original)
+++ incubator/felix/trunk/org.apache.felix.ipojo.plugin/src/main/java/org/apache/felix/ipojo/manipulation/ManipulationProperty.java Thu Jun 22 05:56:53 2006
@@ -18,7 +18,7 @@
/**
* Store properties for the manipulation process.
- * @author Clement Escoffier
+ * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
*
*/
public class ManipulationProperty {
Modified: incubator/felix/trunk/org.apache.felix.ipojo.plugin/src/main/java/org/apache/felix/ipojo/manipulation/Manipulator.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.apache.felix.ipojo.plugin/src/main/java/org/apache/felix/ipojo/manipulation/Manipulator.java?rev=416355&r1=416354&r2=416355&view=diff
==============================================================================
--- incubator/felix/trunk/org.apache.felix.ipojo.plugin/src/main/java/org/apache/felix/ipojo/manipulation/Manipulator.java (original)
+++ incubator/felix/trunk/org.apache.felix.ipojo.plugin/src/main/java/org/apache/felix/ipojo/manipulation/Manipulator.java Thu Jun 22 05:56:53 2006
@@ -23,13 +23,13 @@
import java.util.HashMap;
import java.util.logging.Level;
-import org.apache.felix.ipojo.plugin.IpojoPluginConfiguration;
+import org.apache.felix.ipojo.plugin.IPojoPluginConfiguration;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassWriter;
/**
* iPOJO Bytecode Manipulator.
- * @author Clement Escoffier
+ * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
*
*/
public class Manipulator {
@@ -77,7 +77,7 @@
URL url = clazz.toURI().toURL();
//if (url == null) { throw new ClassNotFoundException(name); }
- IpojoPluginConfiguration.getLogger().log(Level.INFO, "Manipulate the class file : " + clazz.getAbsolutePath());
+ IPojoPluginConfiguration.getLogger().log(Level.INFO, "Manipulate the class file : " + clazz.getAbsolutePath());
InputStream is = url.openStream();
@@ -101,7 +101,7 @@
fos.write(cw0.toByteArray());
fos.close();
- IpojoPluginConfiguration.getLogger().log(Level.INFO, "Put the file " + file.getAbsolutePath() + " in the jar file");
+ IPojoPluginConfiguration.getLogger().log(Level.INFO, "Put the file " + file.getAbsolutePath() + " in the jar file");
} catch (Exception e) { System.err.println("Problem to write the adapted class on the file system " + " [ "+ file.getAbsolutePath() +" ] " + e.getMessage()); }
m_fields = preprocess.getFields();
Modified: incubator/felix/trunk/org.apache.felix.ipojo.plugin/src/main/java/org/apache/felix/ipojo/manipulation/PreprocessClassAdapter.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.apache.felix.ipojo.plugin/src/main/java/org/apache/felix/ipojo/manipulation/PreprocessClassAdapter.java?rev=416355&r1=416354&r2=416355&view=diff
==============================================================================
--- incubator/felix/trunk/org.apache.felix.ipojo.plugin/src/main/java/org/apache/felix/ipojo/manipulation/PreprocessClassAdapter.java (original)
+++ incubator/felix/trunk/org.apache.felix.ipojo.plugin/src/main/java/org/apache/felix/ipojo/manipulation/PreprocessClassAdapter.java Thu Jun 22 05:56:53 2006
@@ -19,7 +19,7 @@
import java.util.HashMap;
import java.util.logging.Level;
-import org.apache.felix.ipojo.plugin.IpojoPluginConfiguration;
+import org.apache.felix.ipojo.plugin.IPojoPluginConfiguration;
import org.objectweb.asm.ClassAdapter;
import org.objectweb.asm.ClassVisitor;
import org.objectweb.asm.FieldVisitor;
@@ -36,7 +36,7 @@
* - Store information about field ok
* - Store information about implemented interfaces ok
* - Change GETFIELD and PUTFIELD to called the getter and setter method
- * @author Clement Escoffier
+ * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
*
*/
public class PreprocessClassAdapter extends ClassAdapter implements Opcodes {
@@ -157,7 +157,7 @@
final String signature,
final Object value) {
if ((access & ACC_STATIC) == 0) {
- IpojoPluginConfiguration.getLogger().log(Level.INFO, "Manipulate the field declaration of " + name);
+ IPojoPluginConfiguration.getLogger().log(Level.INFO, "Manipulate the field declaration of " + name);
Type type = Type.getType(desc);
// Keep the field in the code
@@ -392,7 +392,7 @@
break;
default :
- IpojoPluginConfiguration.getLogger().log(Level.SEVERE, "Manipulation problem in " + m_owner + " : a type is not implemented : " + type);
+ IPojoPluginConfiguration.getLogger().log(Level.SEVERE, "Manipulation problem in " + m_owner + " : a type is not implemented : " + type);
break;
}
@@ -460,7 +460,7 @@
mv.visitInsn(RETURN);
break;
default :
- IpojoPluginConfiguration.getLogger().log(Level.SEVERE, "Manipulation Error : Cannot create the setter method for the field : " + name + " (" + type + ")");
+ IPojoPluginConfiguration.getLogger().log(Level.SEVERE, "Manipulation Error : Cannot create the setter method for the field : " + name + " (" + type + ")");
break;
}
Modified: incubator/felix/trunk/org.apache.felix.ipojo.plugin/src/main/java/org/apache/felix/ipojo/manipulation/PreprocessCodeAdapter.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.apache.felix.ipojo.plugin/src/main/java/org/apache/felix/ipojo/manipulation/PreprocessCodeAdapter.java?rev=416355&r1=416354&r2=416355&view=diff
==============================================================================
--- incubator/felix/trunk/org.apache.felix.ipojo.plugin/src/main/java/org/apache/felix/ipojo/manipulation/PreprocessCodeAdapter.java (original)
+++ incubator/felix/trunk/org.apache.felix.ipojo.plugin/src/main/java/org/apache/felix/ipojo/manipulation/PreprocessCodeAdapter.java Thu Jun 22 05:56:53 2006
@@ -18,16 +18,14 @@
import java.util.logging.Level;
-import org.apache.felix.ipojo.plugin.IpojoPluginConfiguration;
+import org.apache.felix.ipojo.plugin.IPojoPluginConfiguration;
import org.objectweb.asm.MethodAdapter;
import org.objectweb.asm.MethodVisitor;
import org.objectweb.asm.Opcodes;
/**
- * Date : 29 janv. 2006
- * @author clément
- *
+ * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
*/
public class PreprocessCodeAdapter extends MethodAdapter implements Opcodes {
@@ -61,14 +59,14 @@
final String desc) {
if (owner.equals(m_owner)) {
if (opcode == GETFIELD) {
- IpojoPluginConfiguration.getLogger().log(Level.INFO, "Manipulate a GETFIELD on : " + name);
+ IPojoPluginConfiguration.getLogger().log(Level.INFO, "Manipulate a GETFIELD on : " + name);
String gDesc = "()" + desc;
visitMethodInsn(INVOKEVIRTUAL, owner, "_get" + name, gDesc);
return;
} else
if (opcode == PUTFIELD) {
// replaces PUTFIELD f by INVOKESPECIAL _setf
- IpojoPluginConfiguration.getLogger().log(Level.INFO, "Manipulate a PUTFIELD on : " + name);
+ IPojoPluginConfiguration.getLogger().log(Level.INFO, "Manipulate a PUTFIELD on : " + name);
String sDesc = "(" + desc + ")V";
visitMethodInsn(INVOKESPECIAL, owner, "_set" + name, sDesc);
return;
Modified: incubator/felix/trunk/org.apache.felix.ipojo.plugin/src/main/java/org/apache/felix/ipojo/parser/ManifestMetadataParser.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.apache.felix.ipojo.plugin/src/main/java/org/apache/felix/ipojo/parser/ManifestMetadataParser.java?rev=416355&r1=416354&r2=416355&view=diff
==============================================================================
--- incubator/felix/trunk/org.apache.felix.ipojo.plugin/src/main/java/org/apache/felix/ipojo/parser/ManifestMetadataParser.java (original)
+++ incubator/felix/trunk/org.apache.felix.ipojo.plugin/src/main/java/org/apache/felix/ipojo/parser/ManifestMetadataParser.java Thu Jun 22 05:56:53 2006
@@ -21,12 +21,12 @@
import org.apache.felix.ipojo.metadata.Attribute;
import org.apache.felix.ipojo.metadata.Element;
-import org.apache.felix.ipojo.plugin.IpojoPluginConfiguration;
+import org.apache.felix.ipojo.plugin.IPojoPluginConfiguration;
/**
* Manifest Metadata parser.
* Read a manifest file and construct metadata
- * @author Clement Escoffier
+ * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
*/
public class ManifestMetadataParser {
@@ -135,13 +135,13 @@
c = string[i];
}
Attribute att = new Attribute(attName, attNs ,attValue);
- IpojoPluginConfiguration.getLogger().log(Level.INFO, "Detect a new attribute : '" + "[" + attNs + "]" + attName + "' = '" + attValue + "'");
+ IPojoPluginConfiguration.getLogger().log(Level.INFO, "Detect a new attribute : '" + "[" + attNs + "]" + attName + "' = '" + attValue + "'");
m_elements[m_elements.length - 1].addAttribute(att);
break;
case '}' :
Element lastElement = removeLastElement();
- IpojoPluginConfiguration.getLogger().log(Level.INFO, "End of the element : " + lastElement.getName());
+ IPojoPluginConfiguration.getLogger().log(Level.INFO, "End of the element : " + lastElement.getName());
if (m_elements.length != 0) {
Element newQueue = m_elements[m_elements.length - 1];
newQueue.addElement(lastElement);
@@ -172,7 +172,7 @@
i = i + 1; // skip {
Element elem = new Element(name, ns);
addElement(elem);
- IpojoPluginConfiguration.getLogger().log(Level.INFO, "Start an new element : " + name);
+ IPojoPluginConfiguration.getLogger().log(Level.INFO, "Start an new element : " + name);
break;
}
}
Modified: incubator/felix/trunk/org.apache.felix.ipojo.plugin/src/main/java/org/apache/felix/ipojo/parser/ParseException.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.apache.felix.ipojo.plugin/src/main/java/org/apache/felix/ipojo/parser/ParseException.java?rev=416355&r1=416354&r2=416355&view=diff
==============================================================================
--- incubator/felix/trunk/org.apache.felix.ipojo.plugin/src/main/java/org/apache/felix/ipojo/parser/ParseException.java (original)
+++ incubator/felix/trunk/org.apache.felix.ipojo.plugin/src/main/java/org/apache/felix/ipojo/parser/ParseException.java Thu Jun 22 05:56:53 2006
@@ -18,7 +18,7 @@
/**
* Exceptions thrown by parsers.
- * @author Clement Escoffier
+ * @author <a href="mailto:felix-dev@incubator.apache.org">Felix Project Team</a>
*/
public class ParseException extends Exception {
Modified: incubator/felix/trunk/org.apache.felix.ipojo.plugin/src/main/java/org/apache/felix/ipojo/parser/XMLMetadataParser.java
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.apache.felix.ipojo.plugin/src/main/java/org/apache/felix/ipojo/parser/XMLMetadataParser.java?rev=416355&r1=416354&r2=416355&view=diff
==============================================================================
--- incubator/felix/trunk/org.apache.felix.ipojo.plugin/src/main/java/org/apache/felix/ipojo/parser/XMLMetadataParser.java (original)
+++ incubator/felix/trunk/org.apache.felix.ipojo.plugin/src/main/java/org/apache/felix/ipojo/parser/XMLMetadataParser.java Thu Jun 22 05:56:53 2006
@@ -20,7 +20,7 @@
import org.apache.felix.ipojo.metadata.Attribute;
import org.apache.felix.ipojo.metadata.Element;
-import org.apache.felix.ipojo.plugin.IpojoPluginConfiguration;
+import org.apache.felix.ipojo.plugin.IPojoPluginConfiguration;
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.Locator;
@@ -57,7 +57,7 @@
* @see org.xml.sax.ContentHandler#endDocument()
*/
public void endDocument() throws SAXException {
- IpojoPluginConfiguration.getLogger().log(Level.INFO, "End of the XML parsing, " + m_elements.length + " primary elements found");
+ IPojoPluginConfiguration.getLogger().log(Level.INFO, "End of the XML parsing, " + m_elements.length + " primary elements found");
}
@@ -71,7 +71,7 @@
// Check if the name is consitent with the name of this end tag
if (!lastElement.getName().equalsIgnoreCase(qName) && !lastElement.getNameSpace().equals(namespaceURI)) {
- IpojoPluginConfiguration.getLogger().log(Level.SEVERE, "Parse error when ending an element : " + qName + " [" + namespaceURI + "]");
+ IPojoPluginConfiguration.getLogger().log(Level.SEVERE, "Parse error when ending an element : " + qName + " [" + namespaceURI + "]");
throw new SAXException("Parse error when ending an element : " + qName + " [" + namespaceURI + "]");
}
@@ -132,7 +132,7 @@
* @see org.xml.sax.ContentHandler#startDocument()
*/
public void startDocument() throws SAXException {
- IpojoPluginConfiguration.getLogger().log(Level.INFO, "Start of the XML parsing");
+ IPojoPluginConfiguration.getLogger().log(Level.INFO, "Start of the XML parsing");
}
@@ -141,7 +141,7 @@
*/
public void startElement(String namespaceURI, String localName,
String qName, Attributes atts) throws SAXException {
- IpojoPluginConfiguration.getLogger().log(Level.INFO, "An XML tag was openend : " + localName + " [" + namespaceURI + "]");
+ IPojoPluginConfiguration.getLogger().log(Level.INFO, "An XML tag was openend : " + localName + " [" + namespaceURI + "]");
Element elem = new Element(localName, namespaceURI);
Copied: incubator/felix/trunk/org.apache.felix.ipojo.plugin/src/main/java/org/apache/felix/ipojo/plugin/IPojoPluginConfiguration.java (from r416313, incubator/felix/trunk/org.apache.felix.ipojo.plugin/src/main/java/org/apache/felix/ipojo/plugin/IpojoPluginConfiguration.java)
URL: http://svn.apache.org/viewvc/incubator/felix/trunk/org.apache.felix.ipojo.plugin/src/main/java/org/apache/felix/ipojo/plugin/IPojoPluginConfiguration.java?p2=incubator/felix/trunk/org.apache.felix.ipojo.plugin/src/main/java/org/apache/felix/ipojo/plugin/IPojoPluginConfiguration.java&p1=incubator/felix/trunk/org.apache.felix.ipojo.plugin/src/main/java/org/apache/felix/ipojo/plugin/IpojoPluginConfiguration.java&r1=416313&r2=416355&rev=416355&view=diff
==============================================================================
--- incubator/felix/trunk/org.apache.felix.ipojo.plugin/src/main/java/org/apache/felix/ipojo/plugin/IpojoPluginConfiguration.java (original)
+++ incubator/felix/trunk/org.apache.felix.ipojo.plugin/src/main/java/org/apache/felix/ipojo/plugin/IPojoPluginConfiguration.java Thu Jun 22 05:56:53 2006
@@ -19,7 +19,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-public class IpojoPluginConfiguration {
+public class IPojoPluginConfiguration {
private static Logger logger;