You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by mn...@apache.org on 2010/10/07 12:55:02 UTC
svn commit: r1005406 - in /incubator/aries/trunk:
application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/
blueprint/blueprint-annotation-impl/src/main/java/org/apache/aries/blueprint/annotation/impl/
Author: mnuttall
Date: Thu Oct 7 10:55:02 2010
New Revision: 1005406
URL: http://svn.apache.org/viewvc?rev=1005406&view=rev
Log:
ARIES-432: Remove System.out calls. From a patch by Emily Jiang.
Modified:
incubator/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModelledResourceManagerImpl.java
incubator/aries/trunk/blueprint/blueprint-annotation-impl/src/main/java/org/apache/aries/blueprint/annotation/impl/Activator.java
incubator/aries/trunk/blueprint/blueprint-annotation-impl/src/main/java/org/apache/aries/blueprint/annotation/impl/BlueprintAnnotationScannerImpl.java
Modified: incubator/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModelledResourceManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModelledResourceManagerImpl.java?rev=1005406&r1=1005405&r2=1005406&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModelledResourceManagerImpl.java (original)
+++ incubator/aries/trunk/application/application-modeller/src/main/java/org/apache/aries/application/modelling/impl/ModelledResourceManagerImpl.java Thu Oct 7 10:55:02 2010
@@ -185,13 +185,6 @@ public class ModelledResourceManagerImpl
File bundleFile = new File(appBundle.toString());
BundleManifest bundleMf = BundleManifest.fromBundle(bundleFile);
BundleBlueprintParser bpParser = new BundleBlueprintParser(bundleMf);
- ZipFile zipFile = new ZipFile(bundleFile);
- Enumeration<? extends ZipEntry> entries = zipFile.entries();
- while (entries.hasMoreElements()) {
- ZipEntry ze = entries.nextElement();
-
- System.out.println(ze.getName());
- }
List<IFile> files = appBundle.listAllFiles();
Iterator<IFile> it = files.iterator();
while (it.hasNext()) {
Modified: incubator/aries/trunk/blueprint/blueprint-annotation-impl/src/main/java/org/apache/aries/blueprint/annotation/impl/Activator.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-annotation-impl/src/main/java/org/apache/aries/blueprint/annotation/impl/Activator.java?rev=1005406&r1=1005405&r2=1005406&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-annotation-impl/src/main/java/org/apache/aries/blueprint/annotation/impl/Activator.java (original)
+++ incubator/aries/trunk/blueprint/blueprint-annotation-impl/src/main/java/org/apache/aries/blueprint/annotation/impl/Activator.java Thu Oct 7 10:55:02 2010
@@ -30,15 +30,12 @@ public class Activator implements Bundle
ServiceRegistration sr;
public void start(BundleContext context) {
- System.out.println("Annotation Scanner Impl Bundle start");
Dictionary dict = new Hashtable();
dict.put(Constants.SERVICE_RANKING, 0);
sr = context.registerService(BlueprintAnnotationScanner.class.getName(), new BlueprintAnnotationScannerImpl(context), dict);
- System.out.println("finish register service");
}
public void stop(BundleContext context) {
- System.out.println("Annotation Scanner Impl Bundle stop");
if (sr != null) {
sr.unregister();
}
Modified: incubator/aries/trunk/blueprint/blueprint-annotation-impl/src/main/java/org/apache/aries/blueprint/annotation/impl/BlueprintAnnotationScannerImpl.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-annotation-impl/src/main/java/org/apache/aries/blueprint/annotation/impl/BlueprintAnnotationScannerImpl.java?rev=1005406&r1=1005405&r2=1005406&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-annotation-impl/src/main/java/org/apache/aries/blueprint/annotation/impl/BlueprintAnnotationScannerImpl.java (original)
+++ incubator/aries/trunk/blueprint/blueprint-annotation-impl/src/main/java/org/apache/aries/blueprint/annotation/impl/BlueprintAnnotationScannerImpl.java Thu Oct 7 10:55:02 2010
@@ -143,8 +143,6 @@ public class BlueprintAnnotationScannerI
// TODO Auto-generated catch block
e.printStackTrace();
}
-
- System.out.println("generated annotation xml is located " + file.getAbsolutePath());
try {
return file.toURL();
} catch (MalformedURLException e) {