You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by mc...@apache.org on 2012/08/07 12:57:24 UTC
svn commit: r1370165 [1/2] - in
/felix/trunk/bundleplugin/src/main/java/aQute: bnd/build/
bnd/compatibility/ bnd/component/ bnd/differ/ bnd/filerepo/ bnd/header/
bnd/make/calltree/ bnd/make/component/ bnd/make/coverage/
bnd/make/metatype/ bnd/maven/ bn...
Author: mcculls
Date: Tue Aug 7 10:57:21 2012
New Revision: 1370165
URL: http://svn.apache.org/viewvc?rev=1370165&view=rev
Log:
Latest bnd sync
Modified:
felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/Container.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/Project.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/ProjectBuilder.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/ProjectMessages.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/ProjectTester.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/ReflectAction.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/Workspace.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/WorkspaceRepository.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/packageinfo
felix/trunk/bundleplugin/src/main/java/aQute/bnd/compatibility/Access.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/compatibility/GenericParameter.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/compatibility/Kind.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/compatibility/Scope.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/component/AnnotationReader.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/component/DSAnnotations.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/component/HeaderReader.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/component/ReferenceDef.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/component/TagResource.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/differ/DiffImpl.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/differ/Element.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/filerepo/FileRepo.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/header/Attrs.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/header/Parameters.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/make/calltree/CalltreeResource.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/make/component/ComponentAnnotationReader.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/make/component/ServiceComponent.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/make/coverage/Coverage.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/make/metatype/MetaTypeReader.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/MavenCommand.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/MavenDependencyGraph.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/MavenDeploy.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/MavenDeployCmd.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/MavenRepository.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/support/CachedPom.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/support/MavenEntry.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/support/MavenRemoteRepository.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/support/Pom.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/support/ProjectPom.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/support/packageinfo
felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Analyzer.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Annotation.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Builder.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/BundleId.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Clazz.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/CombinedResource.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Descriptors.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/EmbeddedResource.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/FileResource.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Instruction.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Instructions.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Jar.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/JarResource.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Macro.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Packages.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/PreprocessResource.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Processor.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/URLResource.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Verifier.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/WriteResource.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/ZipResource.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/resource/Filters.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/repo/eclipse/EclipseRepo.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/service/Deploy.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/service/RepositoryPlugin.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/service/packageinfo
felix/trunk/bundleplugin/src/main/java/aQute/bnd/service/repository/MinimalRepository.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/signing/JartoolSigner.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/version/Version.java
felix/trunk/bundleplugin/src/main/java/aQute/bnd/version/VersionRange.java
felix/trunk/bundleplugin/src/main/java/aQute/lib/base64/Base64.java
felix/trunk/bundleplugin/src/main/java/aQute/lib/collections/SortedList.java
felix/trunk/bundleplugin/src/main/java/aQute/lib/deployer/FileInstallRepo.java
felix/trunk/bundleplugin/src/main/java/aQute/lib/deployer/FileRepo.java
felix/trunk/bundleplugin/src/main/java/aQute/lib/filter/Filter.java
felix/trunk/bundleplugin/src/main/java/aQute/lib/index/Index.java
felix/trunk/bundleplugin/src/main/java/aQute/lib/io/IO.java
felix/trunk/bundleplugin/src/main/java/aQute/lib/json/ByteArrayHandler.java
felix/trunk/bundleplugin/src/main/java/aQute/lib/json/Encoder.java
felix/trunk/bundleplugin/src/main/java/aQute/lib/json/StringHandler.java
felix/trunk/bundleplugin/src/main/java/aQute/lib/spring/JPAComponent.java
felix/trunk/bundleplugin/src/main/java/aQute/lib/spring/SpringXMLType.java
felix/trunk/bundleplugin/src/main/java/aQute/lib/tag/Tag.java
felix/trunk/bundleplugin/src/main/java/aQute/libg/cafs/CAFS.java
felix/trunk/bundleplugin/src/main/java/aQute/libg/clauses/Selector.java
felix/trunk/bundleplugin/src/main/java/aQute/libg/command/Command.java
felix/trunk/bundleplugin/src/main/java/aQute/libg/cryptography/Digest.java
felix/trunk/bundleplugin/src/main/java/aQute/libg/sed/ReplacerAdapter.java
felix/trunk/bundleplugin/src/main/java/aQute/libg/tarjan/Tarjan.java
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/Container.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/Container.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/Container.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/Container.java Tue Aug 7 10:57:21 2012
@@ -103,12 +103,14 @@ public class Container {
return error;
}
+ @Override
public boolean equals(Object other) {
if (other instanceof Container)
return file.equals(((Container) other).file);
return false;
}
+ @Override
public int hashCode() {
return file.hashCode();
}
@@ -122,6 +124,7 @@ public class Container {
*
* @return
*/
+ @Override
public String toString() {
if (getError() != null)
return "/error/" + getError();
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/Project.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/Project.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/Project.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/Project.java Tue Aug 7 10:57:21 2012
@@ -14,6 +14,7 @@ import aQute.bnd.maven.support.*;
import aQute.bnd.osgi.*;
import aQute.bnd.osgi.eclipse.*;
import aQute.bnd.service.*;
+import aQute.bnd.service.RepositoryPlugin.PutResult;
import aQute.bnd.service.RepositoryPlugin.Strategy;
import aQute.bnd.service.action.*;
import aQute.bnd.version.*;
@@ -146,6 +147,7 @@ public class Project extends Processor {
return workspace;
}
+ @Override
public String toString() {
return getBase().getName();
}
@@ -202,7 +204,9 @@ public class Project extends Processor {
// Set default bin directory
output = getOutput0();
if (!output.exists()) {
- output.mkdirs();
+ if (!output.mkdirs()) {
+ throw new IOException("Could not create directory " + output);
+ }
getWorkspace().changedFile(output);
}
if (!output.isDirectory())
@@ -296,10 +300,12 @@ public class Project extends Processor {
/**
*
*/
- private File getTarget0() {
+ private File getTarget0() throws IOException {
File target = getFile(getProperty("target", "generated"));
if (!target.exists()) {
- target.mkdirs();
+ if (!target.mkdirs()) {
+ throw new IOException("Could not create directory " + target);
+ }
getWorkspace().changedFile(target);
}
return target;
@@ -809,15 +815,16 @@ public class Project extends Processor {
return join(list, separator);
}
+ @Override
protected Object[] getMacroDomains() {
return new Object[] {
workspace
};
}
- public File release(Jar jar) throws Exception {
+ public File release(String jarName, InputStream jarStream) throws Exception {
String name = getProperty(Constants.RELEASEREPO);
- return release(name, jar);
+ return release(name, jarName, jarStream);
}
/**
@@ -825,11 +832,12 @@ public class Project extends Processor {
*
* @param name
* The repository name
- * @param jar
+ * @param jarName
+ * @param jarStream
* @return
* @throws Exception
*/
- public File release(String name, Jar jar) throws Exception {
+ public File release(String name, String jarName, InputStream jarStream) throws Exception {
trace("release %s", name);
List<RepositoryPlugin> plugins = getPlugins(RepositoryPlugin.class);
RepositoryPlugin rp = null;
@@ -848,14 +856,11 @@ public class Project extends Processor {
if (rp != null) {
try {
- File file = rp.put(jar);
- trace("Released %s to file %s in repository %s", jar.getName(), file, rp);
+ PutResult r = rp.put(jarStream, new RepositoryPlugin.PutOptions());
+ trace("Released %s to %s in repository %s", jarName, r.artifact, rp);
}
catch (Exception e) {
- msgs.Release_Into_Exception_(jar, rp, e);
- }
- finally {
- jar.close();
+ msgs.Release_Into_Exception_(jarName, rp, e);
}
} else if (name == null)
msgs.NoNameForReleaseRepository();
@@ -890,15 +895,8 @@ public class Project extends Processor {
}
trace("build ", Arrays.toString(jars));
for (File jar : jars) {
- Jar j = new Jar(jar);
- try {
- release(name, j);
- }
- finally {
- j.close();
- }
+ release(name, jar.getName(), new BufferedInputStream(new FileInputStream(jar)));
}
-
}
/**
@@ -1114,17 +1112,13 @@ public class Project extends Processor {
}
if (rp != null) {
- Jar jar = new Jar(file);
try {
- rp.put(jar);
+ rp.put(new BufferedInputStream(new FileInputStream(file)), new RepositoryPlugin.PutOptions());
return;
}
catch (Exception e) {
msgs.DeployingFile_On_Exception_(file, rp.getName(), e);
}
- finally {
- jar.close();
- }
return;
}
trace("No repo found " + file);
@@ -1155,22 +1149,16 @@ public class Project extends Processor {
}
File[] outputs = getBuildFiles();
for (File output : outputs) {
- Jar jar = new Jar(output);
- try {
for (Deploy d : getPlugins(Deploy.class)) {
- trace("Deploying %s to: %s", jar, d);
+ trace("Deploying %s to: %s", output.getName(), d);
try {
- if (d.deploy(this, jar))
+ if (d.deploy(this, output.getName(), new BufferedInputStream(new FileInputStream(output))))
trace("deployed %s successfully to %s", output, d);
}
catch (Exception e) {
msgs.Deploying(e);
}
}
- }
- finally {
- jar.close();
- }
}
}
@@ -1452,8 +1440,12 @@ public class Project extends Processor {
if (!f.exists() || f.lastModified() < jar.lastModified()) {
reportNewer(f.lastModified(), jar);
f.delete();
- if (!f.getParentFile().isDirectory())
- f.getParentFile().mkdirs();
+ File fp = f.getParentFile();
+ if (!fp.isDirectory()) {
+ if (!fp.exists() && !fp.mkdirs()) {
+ throw new IOException("Could not create directory " + fp);
+ }
+ }
jar.write(f);
getWorkspace().changedFile(f);
@@ -1491,6 +1483,7 @@ public class Project extends Processor {
/**
* Refresh if we are based on stale data. This also implies our workspace.
*/
+ @Override
public boolean refresh() {
boolean changed = false;
if (isCnf()) {
@@ -1503,6 +1496,7 @@ public class Project extends Processor {
return getBase().getName().equals(Workspace.CNFDIR);
}
+ @Override
public void propertiesChanged() {
super.propertiesChanged();
preparedPaths = false;
@@ -1568,12 +1562,16 @@ public class Project extends Processor {
File target = getTarget0();
if (target.isDirectory() && target.getParentFile() != null) {
IO.delete(target);
- target.mkdirs();
+ if (!target.exists() && !target.mkdirs()) {
+ throw new IOException("Could not create directory " + target);
+ }
}
File output = getOutput0();
if (getOutput().isDirectory())
IO.delete(output);
- output.mkdirs();
+ if (!output.exists() && !output.mkdirs()) {
+ throw new IOException("Could not create directory " + output);
+ }
}
public File[] build() throws Exception {
@@ -2052,7 +2050,10 @@ public class Project extends Processor {
String path = packageName.replace('.', '/') + "/packageinfo";
File binary = IO.getFile(getOutput(), path);
- binary.getParentFile().mkdirs();
+ File bp = binary.getParentFile();
+ if (!bp.exists() && !bp.mkdirs()) {
+ throw new IOException("Could not create directory " + bp);
+ }
IO.copy(file, binary);
refresh();
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/ProjectBuilder.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/ProjectBuilder.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/ProjectBuilder.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/ProjectBuilder.java Tue Aug 7 10:57:21 2012
@@ -27,12 +27,14 @@ public class ProjectBuilder extends Buil
/**
* We put our project and our workspace on the macro path.
*/
+ @Override
protected Object[] getMacroDomains() {
return new Object[] {
project, project.getWorkspace()
};
}
+ @Override
public Builder getSubBuilder() throws Exception {
return project.getBuilder(this);
}
@@ -41,6 +43,7 @@ public class ProjectBuilder extends Buil
return project;
}
+ @Override
public void init() {
try {
if (!initialized) {
@@ -68,6 +71,7 @@ public class ProjectBuilder extends Buil
}
}
+ @Override
public List<Jar> getClasspath() {
init();
return super.getClasspath();
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/ProjectMessages.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/ProjectMessages.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/ProjectMessages.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/ProjectMessages.java Tue Aug 7 10:57:21 2012
@@ -3,7 +3,6 @@ package aQute.bnd.build;
import java.io.*;
import java.util.*;
-import aQute.bnd.osgi.*;
import aQute.bnd.service.*;
import aQute.bnd.service.RepositoryPlugin.Strategy;
import aQute.bnd.version.*;
@@ -39,7 +38,7 @@ public interface ProjectMessages extends
ERROR ReleaseRepository_NotFoundIn_(String name, List<RepositoryPlugin> plugins);
- ERROR Release_Into_Exception_(Jar jar, RepositoryPlugin rp, Exception e);
+ ERROR Release_Into_Exception_(String jar, RepositoryPlugin rp, Exception e);
ERROR NoScripters_(String script);
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/ProjectTester.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/ProjectTester.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/ProjectTester.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/ProjectTester.java Tue Aug 7 10:57:21 2012
@@ -63,7 +63,9 @@ public abstract class ProjectTester {
}
public boolean prepare() throws Exception {
- reportDir.mkdirs();
+ if (!reportDir.exists() && !reportDir.mkdirs()) {
+ throw new IOException("Could not create directory " + reportDir);
+ }
for (File file : reportDir.listFiles()) {
file.delete();
}
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/ReflectAction.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/ReflectAction.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/ReflectAction.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/ReflectAction.java Tue Aug 7 10:57:21 2012
@@ -16,6 +16,7 @@ public class ReflectAction implements Ac
m.invoke(project);
}
+ @Override
public String toString() {
return "ra:" + what;
}
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/Workspace.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/Workspace.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/Workspace.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/Workspace.java Tue Aug 7 10:57:21 2012
@@ -81,7 +81,9 @@ public class Workspace extends Processor
public Workspace(File dir) throws Exception {
dir = dir.getAbsoluteFile();
- dir.mkdirs();
+ if (!dir.exists() && !dir.mkdirs()) {
+ throw new IOException("Could not create directory " + dir);
+ }
assert dir.isDirectory();
File buildDir = new File(dir, BNDDIR).getAbsoluteFile();
@@ -123,6 +125,7 @@ public class Workspace extends Processor
return models.values();
}
+ @Override
public boolean refresh() {
if (super.refresh()) {
for (Project project : getCurrentProjects()) {
@@ -261,19 +264,23 @@ public class Workspace extends Processor
super("cache", getFile(buildDir, CACHEDIR), false);
}
+ @Override
public String toString() {
return "bnd-cache";
}
+ @Override
protected void init() throws Exception {
if (lock.tryLock(50, TimeUnit.SECONDS) == false)
throw new TimeLimitExceededException("Cached File Repo is locked and can't acquire it");
try {
if (!inited) {
inited = true;
- root.mkdirs();
+ if (!root.exists() && !root.mkdirs()) {
+ throw new IOException("Could not create cache directory " + root);
+ }
if (!root.isDirectory())
- throw new IllegalArgumentException("Cannot create cache dir " + root);
+ throw new IllegalArgumentException("Cache directory " + root + " not a directory");
InputStream in = getClass().getResourceAsStream(EMBEDDED_REPO);
if (in != null)
@@ -296,7 +303,10 @@ public class Workspace extends Processor
if (!jentry.isDirectory()) {
File dest = Processor.getFile(dir, jentry.getName());
if (!dest.isFile() || dest.lastModified() < jentry.getTime() || jentry.getTime() == 0) {
- dest.getParentFile().mkdirs();
+ File dp = dest.getParentFile();
+ if (!dp.exists() && !dp.mkdirs()) {
+ throw new IOException("Could not create directory " + dp);
+ }
FileOutputStream out = new FileOutputStream(dest);
try {
copy(jin, out);
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/WorkspaceRepository.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/WorkspaceRepository.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/WorkspaceRepository.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/WorkspaceRepository.java Tue Aug 7 10:57:21 2012
@@ -86,7 +86,7 @@ public class WorkspaceRepository impleme
return false;
}
- public File put(Jar jar) throws Exception {
+ public PutResult put(InputStream stream, PutOptions options) throws Exception {
return null;
}
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/packageinfo
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/packageinfo?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/packageinfo (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/build/packageinfo Tue Aug 7 10:57:21 2012
@@ -1 +1 @@
-version 1.45.0
+version 2.0.0
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/compatibility/Access.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/compatibility/Access.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/compatibility/Access.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/compatibility/Access.java Tue Aug 7 10:57:21 2012
@@ -19,6 +19,7 @@ public enum Access {
return PACKAGE;
}
+ @Override
public String toString() {
return super.toString().toLowerCase();
}
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/compatibility/GenericParameter.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/compatibility/GenericParameter.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/compatibility/GenericParameter.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/compatibility/GenericParameter.java Tue Aug 7 10:57:21 2012
@@ -13,6 +13,7 @@ public class GenericParameter {
};
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(name);
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/compatibility/Kind.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/compatibility/Kind.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/compatibility/Kind.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/compatibility/Kind.java Tue Aug 7 10:57:21 2012
@@ -6,6 +6,7 @@ package aQute.bnd.compatibility;
public enum Kind {
ROOT, CLASS, FIELD, CONSTRUCTOR, METHOD, UNKNOWN;
+ @Override
public String toString() {
return super.toString().toLowerCase();
}
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/compatibility/Scope.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/compatibility/Scope.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/compatibility/Scope.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/compatibility/Scope.java Tue Aug 7 10:57:21 2012
@@ -68,6 +68,7 @@ public class Scope {
base = typeSignature;
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/component/AnnotationReader.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/component/AnnotationReader.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/component/AnnotationReader.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/component/AnnotationReader.java Tue Aug 7 10:57:21 2012
@@ -129,6 +129,7 @@ public class AnnotationReader extends Cl
return null;
}
+ @Override
public void annotation(Annotation annotation) {
try {
java.lang.annotation.Annotation a = annotation.getAnnotation();
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/component/DSAnnotations.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/component/DSAnnotations.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/component/DSAnnotations.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/component/DSAnnotations.java Tue Aug 7 10:57:21 2012
@@ -29,15 +29,13 @@ public class DSAnnotations implements An
if (instruction.matches(c.getFQN())) {
if (instruction.isNegated())
break;
- else {
- ComponentDef definition = AnnotationReader.getDefinition(c, analyzer);
- if (definition != null) {
- definition.sortReferences();
- definition.prepare(analyzer);
- String name = "OSGI-INF/" + definition.name + ".xml";
- names.add(name);
- analyzer.getJar().putResource(name, new TagResource(definition.getTag()));
- }
+ ComponentDef definition = AnnotationReader.getDefinition(c, analyzer);
+ if (definition != null) {
+ definition.sortReferences();
+ definition.prepare(analyzer);
+ String name = "OSGI-INF/" + definition.name + ".xml";
+ names.add(name);
+ analyzer.getJar().putResource(name, new TagResource(definition.getTag()));
}
}
}
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/component/HeaderReader.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/component/HeaderReader.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/component/HeaderReader.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/component/HeaderReader.java Tue Aug 7 10:57:21 2012
@@ -91,6 +91,7 @@ public class HeaderReader extends Proces
clazz.parseClassFileWithCollector(new ClassDataCollector() {
+ @Override
public void method(MethodDef md) {
Set<String> allowedParams = allowed;
String lifecycleName = null;
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/component/ReferenceDef.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/component/ReferenceDef.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/component/ReferenceDef.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/component/ReferenceDef.java Tue Aug 7 10:57:21 2012
@@ -88,6 +88,7 @@ class ReferenceDef {
return b;
}
+ @Override
public String toString() {
return name;
}
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/component/TagResource.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/component/TagResource.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/component/TagResource.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/component/TagResource.java Tue Aug 7 10:57:21 2012
@@ -12,6 +12,7 @@ public class TagResource extends WriteRe
this.tag = tag;
}
+ @Override
public void write(OutputStream out) throws UnsupportedEncodingException {
OutputStreamWriter ow = new OutputStreamWriter(out, "UTF-8");
PrintWriter pw = new PrintWriter(ow);
@@ -24,6 +25,7 @@ public class TagResource extends WriteRe
}
}
+ @Override
public long lastModified() {
return 0;
}
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/differ/DiffImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/differ/DiffImpl.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/differ/DiffImpl.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/differ/DiffImpl.java Tue Aug 7 10:57:21 2012
@@ -180,10 +180,12 @@ public class DiffImpl implements Diff, C
return children;
}
+ @Override
public String toString() {
return String.format("%-10s %-10s %s", getDelta(), getType(), getName());
}
+ @Override
public boolean equals(Object other) {
if (other instanceof DiffImpl) {
DiffImpl o = (DiffImpl) other;
@@ -192,6 +194,7 @@ public class DiffImpl implements Diff, C
return false;
}
+ @Override
public int hashCode() {
return getDelta().hashCode() ^ getType().hashCode() ^ getName().hashCode();
}
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/differ/Element.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/differ/Element.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/differ/Element.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/differ/Element.java Tue Aug 7 10:57:21 2012
@@ -100,6 +100,7 @@ class Element implements Tree {
return type.compareTo(other.getType());
}
+ @Override
public boolean equals(Object other) {
if (other == null || getClass() != other.getClass())
return false;
@@ -107,6 +108,7 @@ class Element implements Tree {
return compareTo((Element) other) == 0;
}
+ @Override
public int hashCode() {
return type.hashCode() ^ name.hashCode();
}
@@ -135,6 +137,7 @@ class Element implements Tree {
return null;
}
+ @Override
public String toString() {
return type + " " + name + " (" + add + "/" + remove + ")";
}
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/filerepo/FileRepo.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/filerepo/FileRepo.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/filerepo/FileRepo.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/filerepo/FileRepo.java Tue Aug 7 10:57:21 2012
@@ -4,7 +4,6 @@ import java.io.*;
import java.util.*;
import java.util.regex.*;
-import aQute.bnd.osgi.*;
import aQute.bnd.version.*;
public class FileRepo {
@@ -97,9 +96,11 @@ public class FileRepo {
return files[files.length - 1];
}
- public File put(String bsn, Version version) {
+ public File put(String bsn, Version version) throws IOException {
File dir = new File(root, bsn);
- dir.mkdirs();
+ if (!dir.exists() && !dir.mkdirs()) {
+ throw new IOException("Could not create directory " + dir);
+ }
File file = new File(dir, bsn + "-" + version.getMajor() + "." + version.getMinor() + "." + version.getMicro()
+ ".jar");
return file;
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/header/Attrs.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/header/Attrs.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/header/Attrs.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/header/Attrs.java Tue Aug 7 10:57:21 2012
@@ -3,7 +3,6 @@ package aQute.bnd.header;
import java.util.*;
import java.util.regex.*;
-import aQute.bnd.osgi.*;
import aQute.bnd.version.*;
import aQute.lib.collections.*;
@@ -220,6 +219,7 @@ public class Attrs implements Map<String
return get("version");
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
append(sb);
@@ -237,11 +237,13 @@ public class Attrs implements Map<String
}
}
+ @Override
@Deprecated
public boolean equals(Object other) {
return super.equals(other);
}
+ @Override
@Deprecated
public int hashCode() {
return super.hashCode();
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/header/Parameters.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/header/Parameters.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/header/Parameters.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/header/Parameters.java Tue Aug 7 10:57:21 2012
@@ -148,6 +148,7 @@ public class Parameters implements Map<S
return map.values();
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
append(sb);
@@ -168,11 +169,13 @@ public class Parameters implements Map<S
}
}
+ @Override
@Deprecated
public boolean equals(Object other) {
return super.equals(other);
}
+ @Override
@Deprecated
public int hashCode() {
return super.hashCode();
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/make/calltree/CalltreeResource.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/make/calltree/CalltreeResource.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/make/calltree/CalltreeResource.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/make/calltree/CalltreeResource.java Tue Aug 7 10:57:21 2012
@@ -47,6 +47,7 @@ public class CalltreeResource extends Wr
* We set the last modified to 0 so this resource does not force a new JAR
* if all other resources are up to date.
*/
+ @Override
public long lastModified() {
return 0;
}
@@ -55,6 +56,7 @@ public class CalltreeResource extends Wr
* The write method is called to write the resource. We just call the static
* method.
*/
+ @Override
public void write(OutputStream out) throws Exception {
OutputStreamWriter osw = new OutputStreamWriter(out, Constants.DEFAULT_CHARSET);
PrintWriter pw = new PrintWriter(osw);
@@ -87,6 +89,7 @@ public class CalltreeResource extends Wr
Clazz.MethodDef source;
// Before a method is parsed
+ @Override
public void method(Clazz.MethodDef source) {
this.source = source;
xref(using, source, null);
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/make/component/ComponentAnnotationReader.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/make/component/ComponentAnnotationReader.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/make/component/ComponentAnnotationReader.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/make/component/ComponentAnnotationReader.java Tue Aug 7 10:57:21 2012
@@ -80,6 +80,7 @@ public class ComponentAnnotationReader e
return r.map;
}
+ @Override
public void annotation(Annotation annotation) {
String fqn = annotation.getName().getFQN();
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/make/component/ServiceComponent.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/make/component/ServiceComponent.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/make/component/ServiceComponent.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/make/component/ServiceComponent.java Tue Aug 7 10:57:21 2012
@@ -11,11 +11,9 @@ import aQute.bnd.component.*;
import aQute.bnd.header.*;
import aQute.bnd.make.metatype.*;
import aQute.bnd.osgi.*;
-import aQute.bnd.osgi.Clazz.MethodDef;
import aQute.bnd.osgi.Clazz.QUERY;
import aQute.bnd.osgi.Descriptors.TypeRef;
import aQute.bnd.service.*;
-import aQute.bnd.version.*;
import aQute.lib.tag.Tag;
/**
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/make/coverage/Coverage.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/make/coverage/Coverage.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/make/coverage/Coverage.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/make/coverage/Coverage.java Tue Aug 7 10:57:21 2012
@@ -37,6 +37,7 @@ public class Coverage {
clazz.parseClassFileWithCollector(new ClassDataCollector() {
MethodDef source;
+ @Override
public void implementsInterfaces(TypeRef names[]) {
MethodDef def = clazz.getMethodDef(0, "<implements>", "()V");
// TODO
@@ -53,6 +54,7 @@ public class Coverage {
}
// Method definitions
+ @Override
public void method(MethodDef source) {
this.source = source;
}
@@ -77,10 +79,12 @@ public class Coverage {
for (final Clazz clazz : sources) {
clazz.parseClassFileWithCollector(new ClassDataCollector() {
+ @Override
public boolean classStart(int access, TypeRef name) {
return clazz.isPublic();
}
+ @Override
public void method(MethodDef source) {
if (source.isPublic() || source.isProtected())
catalog.put(source, new ArrayList<MethodDef>());
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/make/metatype/MetaTypeReader.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/make/metatype/MetaTypeReader.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/make/metatype/MetaTypeReader.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/make/metatype/MetaTypeReader.java Tue Aug 7 10:57:21 2012
@@ -171,6 +171,7 @@ public class MetaTypeReader extends Writ
final List<String> values = Create.list();
c.parseClassFileWithCollector(new ClassDataCollector() {
+ @Override
public void field(Clazz.FieldDef def) {
if (def.isEnum()) {
values.add(def.getName());
@@ -236,6 +237,7 @@ public class MetaTypeReader extends Writ
}
+ @Override
public void write(OutputStream out) throws IOException {
try {
finish();
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/MavenCommand.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/MavenCommand.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/MavenCommand.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/MavenCommand.java Tue Aug 7 10:57:21 2012
@@ -60,7 +60,9 @@ public class MavenCommand extends Proces
trace("temp dir " + temp);
IO.delete(temp);
- temp.mkdirs();
+ if (!temp.exists() && !temp.mkdirs()) {
+ throw new IOException("Could not create directory " + temp);
+ }
if (!temp.isDirectory())
throw new IOException("Cannot create temp directory");
@@ -210,7 +212,9 @@ public class MavenCommand extends Proces
}
File original = getFile(temp, "original");
- original.mkdirs();
+ if (!original.exists() && !original.mkdirs()) {
+ throw new IOException("Could not create directory " + original);
+ }
binaryJar.expand(original);
binaryJar.calcChecksums(null);
@@ -272,7 +276,9 @@ public class MavenCommand extends Proces
trace("creating bundle dir");
File bundle = new File(temp, "bundle");
- bundle.mkdirs();
+ if (!bundle.exists() && !bundle.mkdirs()) {
+ throw new IOException("Could not create directory " + bundle);
+ }
String prefix = pom.getArtifactId() + "-" + pom.getVersion();
File binaryFile = new File(bundle, prefix + ".jar");
@@ -400,7 +406,9 @@ public class MavenCommand extends Proces
private Jar javadoc(File source, Set<String> exports, Manifest m, Properties p) throws Exception {
File tmp = new File(temp, "javadoc");
- tmp.mkdirs();
+ if (!tmp.exists() && !tmp.mkdirs()) {
+ throw new IOException("Could not create directory " + tmp);
+ }
Command command = new Command();
command.add(getProperty("javadoc", "javadoc"));
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/MavenDependencyGraph.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/MavenDependencyGraph.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/MavenDependencyGraph.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/MavenDependencyGraph.java Tue Aug 7 10:57:21 2012
@@ -63,6 +63,7 @@ public class MavenDependencyGraph {
dependencies.add(artifact);
}
+ @Override
public String toString() {
return groupId + "." + artifactId + "-" + version + "[" + scope + "," + optional + "]";
}
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/MavenDeploy.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/MavenDeploy.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/MavenDeploy.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/MavenDeploy.java Tue Aug 7 10:57:21 2012
@@ -40,56 +40,64 @@ public class MavenDeploy implements Depl
/**
*/
- public boolean deploy(Project project, Jar original) throws Exception {
+ public boolean deploy(Project project, String jarName, InputStream jarStream) throws Exception {
Parameters deploy = project.parseHeader(project.getProperty(Constants.DEPLOY));
Map<String,String> maven = deploy.get(repository);
if (maven == null)
return false; // we're not playing for this bundle
- project.progress("deploying %s to Maven repo: %s", original, repository);
+ project.progress("deploying %s to Maven repo: %s", jarName, repository);
File target = project.getTarget();
File tmp = Processor.getFile(target, repository);
- tmp.mkdirs();
-
- Manifest manifest = original.getManifest();
- if (manifest == null)
- project.error("Jar has no manifest: %s", original);
- else {
- project.progress("Writing pom.xml");
- PomResource pom = new PomResource(manifest);
- pom.setProperties(maven);
- File pomFile = write(tmp, pom, "pom.xml");
-
- Jar main = new Jar("main");
- Jar src = new Jar("src");
- try {
- split(original, main, src);
- Parameters exports = project.parseHeader(manifest.getMainAttributes()
- .getValue(Constants.EXPORT_PACKAGE));
- File jdoc = new File(tmp, "jdoc");
- jdoc.mkdirs();
- project.progress("Generating Javadoc for: " + exports.keySet());
- Jar javadoc = javadoc(jdoc, project, exports.keySet());
- project.progress("Writing javadoc jar");
- File javadocFile = write(tmp, new JarResource(javadoc), "javadoc.jar");
- project.progress("Writing main file");
- File mainFile = write(tmp, new JarResource(main), "main.jar");
- project.progress("Writing sources file");
- File srcFile = write(tmp, new JarResource(main), "src.jar");
-
- project.progress("Deploying main file");
- maven_gpg_sign_and_deploy(project, mainFile, null, pomFile);
- project.progress("Deploying main sources file");
- maven_gpg_sign_and_deploy(project, srcFile, "sources", null);
- project.progress("Deploying main javadoc file");
- maven_gpg_sign_and_deploy(project, javadocFile, "javadoc", null);
+ if (!tmp.exists() && !tmp.mkdirs()) {
+ throw new IOException("Could not create directory " + tmp);
+ }
+ Jar original = new Jar(jarName, jarStream);
+ try {
+ Manifest manifest = original.getManifest();
+ if (manifest == null)
+ project.error("Jar has no manifest: %s", original);
+ else {
+ project.progress("Writing pom.xml");
+ PomResource pom = new PomResource(manifest);
+ pom.setProperties(maven);
+ File pomFile = write(tmp, pom, "pom.xml");
+
+ Jar main = new Jar("main");
+ Jar src = new Jar("src");
+ try {
+ split(original, main, src);
+ Parameters exports = project.parseHeader(manifest.getMainAttributes().getValue(
+ Constants.EXPORT_PACKAGE));
+ File jdoc = new File(tmp, "jdoc");
+ jdoc.mkdirs();
+ project.progress("Generating Javadoc for: " + exports.keySet());
+ Jar javadoc = javadoc(jdoc, project, exports.keySet());
+ project.progress("Writing javadoc jar");
+ File javadocFile = write(tmp, new JarResource(javadoc), "javadoc.jar");
+ project.progress("Writing main file");
+ File mainFile = write(tmp, new JarResource(main), "main.jar");
+ project.progress("Writing sources file");
+ File srcFile = write(tmp, new JarResource(main), "src.jar");
+
+ project.progress("Deploying main file");
+ maven_gpg_sign_and_deploy(project, mainFile, null, pomFile);
+ project.progress("Deploying main sources file");
+ maven_gpg_sign_and_deploy(project, srcFile, "sources", null);
+ project.progress("Deploying main javadoc file");
+ maven_gpg_sign_and_deploy(project, javadocFile, "javadoc", null);
+
+ }
+ finally {
+ main.close();
+ src.close();
+ }
}
- finally {
- main.close();
- src.close();
- }
+ }
+ finally {
+ original.close();
}
return true;
}
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/MavenDeployCmd.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/MavenDeployCmd.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/MavenDeployCmd.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/MavenDeployCmd.java Tue Aug 7 10:57:21 2012
@@ -85,7 +85,9 @@ public class MavenDeployCmd extends Proc
project.progress("deploying %s to Maven repo: %s", original, repository);
File target = project.getTarget();
File tmp = Processor.getFile(target, repository);
- tmp.mkdirs();
+ if (!tmp.exists() && !tmp.mkdirs()) {
+ throw new IOException("Could not create directory " + tmp);
+ }
Manifest manifest = original.getManifest();
if (manifest == null)
@@ -103,7 +105,9 @@ public class MavenDeployCmd extends Proc
Parameters exports = project.parseHeader(manifest.getMainAttributes()
.getValue(Constants.EXPORT_PACKAGE));
File jdoc = new File(tmp, "jdoc");
- jdoc.mkdirs();
+ if (!jdoc.exists() && !jdoc.mkdirs()) {
+ throw new IOException("Could not create directory " + jdoc);
+ }
project.progress("Generating Javadoc for: " + exports.keySet());
Jar javadoc = javadoc(jdoc, project, exports.keySet());
project.progress("Writing javadoc jar");
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/MavenRepository.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/MavenRepository.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/MavenRepository.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/MavenRepository.java Tue Aug 7 10:57:21 2012
@@ -17,6 +17,7 @@ public class MavenRepository implements
Reporter reporter;
String name;
+ @Override
public String toString() {
return "maven:" + root;
}
@@ -112,7 +113,7 @@ public class MavenRepository implements
}
}
- public File put(Jar jar) throws Exception {
+ public PutResult put(InputStream stream, PutOptions options) throws Exception {
throw new IllegalStateException("Maven does not support the put command");
}
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/support/CachedPom.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/support/CachedPom.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/support/CachedPom.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/support/CachedPom.java Tue Aug 7 10:57:21 2012
@@ -11,6 +11,7 @@ public class CachedPom extends Pom {
this.maven = mavenEntry;
}
+ @Override
public File getArtifact() throws Exception {
return maven.getArtifact();
}
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/support/MavenEntry.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/support/MavenEntry.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/support/MavenEntry.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/support/MavenEntry.java Tue Aug 7 10:57:21 2012
@@ -43,7 +43,9 @@ public class MavenEntry implements Close
this.pomPath = path + ".pom";
this.artifactPath = path + ".jar";
this.dir = IO.getFile(maven.repository, path).getParentFile();
- this.dir.mkdirs();
+ if (!this.dir.exists() && !this.dir.mkdirs()) {
+ throw new ExceptionInInitializerError("Could not create directory " + this.dir);
+ }
this.pomFile = new File(maven.repository, pomPath);
this.artifactFile = new File(maven.repository, artifactPath);
this.propertiesFile = new File(dir, "bnd.properties");
@@ -98,7 +100,9 @@ public class MavenEntry implements Close
// the file.
} else {
- dir.mkdirs();
+ if (!dir.exists() && !dir.mkdirs()) {
+ throw new IOException("Could not create directory " + dir);
+ }
// We really do not have the file
// so we have to find out who has it.
for (final URI url : urls) {
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/support/MavenRemoteRepository.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/support/MavenRemoteRepository.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/support/MavenRemoteRepository.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/support/MavenRemoteRepository.java Tue Aug 7 10:57:21 2012
@@ -4,7 +4,6 @@ import java.io.*;
import java.net.*;
import java.util.*;
-import aQute.bnd.osgi.*;
import aQute.bnd.service.*;
import aQute.bnd.version.*;
import aQute.lib.io.*;
@@ -68,7 +67,7 @@ public class MavenRemoteRepository imple
return false;
}
- public File put(Jar jar) throws Exception {
+ public PutResult put(InputStream stream, PutOptions options) throws Exception {
throw new UnsupportedOperationException("cannot do put");
}
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/support/Pom.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/support/Pom.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/support/Pom.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/support/Pom.java Tue Aug 7 10:57:21 2012
@@ -296,6 +296,7 @@ public abstract class Pom {
return in;
}
+ @Override
public String toString() {
return groupId + "+" + artifactId + "-" + version;
}
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/support/ProjectPom.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/support/ProjectPom.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/support/ProjectPom.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/support/ProjectPom.java Tue Aug 7 10:57:21 2012
@@ -136,6 +136,7 @@ public class ProjectPom extends Pom {
// Match any macros
final static Pattern MACRO = Pattern.compile("(\\$\\{\\s*([^}\\s]+)\\s*\\})");
+ @Override
protected String replace(String in) {
System.err.println("Replce: " + in);
if (in == null) {
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/support/packageinfo
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/support/packageinfo?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/support/packageinfo (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/maven/support/packageinfo Tue Aug 7 10:57:21 2012
@@ -1 +1 @@
-version 1.0
+version 2.0
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Analyzer.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Analyzer.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Analyzer.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Analyzer.java Tue Aug 7 10:57:21 2012
@@ -769,6 +769,7 @@ public class Analyzer extends Processor
}
}
+ @Override
public void setBase(File file) {
super.setBase(file);
getProperties().put("project.dir", getBase().getAbsolutePath());
@@ -840,6 +841,7 @@ public class Analyzer extends Processor
return jar;
}
+ @Override
protected void begin() {
if (inited == false) {
inited = true;
@@ -1466,6 +1468,7 @@ public class Analyzer extends Processor
}
}
+ @Override
public void close() {
if (diagnostics) {
PrintStream out = System.err;
@@ -1612,6 +1615,7 @@ public class Analyzer extends Processor
classpath.add(jar);
}
+ @Override
public void clear() {
classpath.clear();
}
@@ -2447,7 +2451,10 @@ public class Analyzer extends Processor
jar.lastModified() - output.lastModified());
if (!output.exists() || output.lastModified() <= jar.lastModified() || force) {
- output.getParentFile().mkdirs();
+ File op = output.getParentFile();
+ if (!op.exists() && !op.mkdirs()) {
+ throw new IOException("Could not create directory " + op);
+ }
if (source != null && output.getCanonicalPath().equals(source.getCanonicalPath())) {
File bak = new File(source.getParentFile(), source.getName() + ".bak");
if (!source.renameTo(bak)) {
@@ -2545,11 +2552,13 @@ public class Analyzer extends Processor
clazz.parseClassFileWithCollector(new ClassDataCollector() {
Clazz.Def member;
+ @Override
public void extendsClass(TypeRef zuper) throws Exception {
if (dest.contains(zuper.getPackageRef()))
xref.add(clazz.getExtends(zuper), zuper);
}
+ @Override
public void implementsInterfaces(TypeRef[] interfaces) throws Exception {
for (TypeRef i : interfaces) {
if (dest.contains(i.getPackageRef()))
@@ -2557,6 +2566,7 @@ public class Analyzer extends Processor
}
}
+ @Override
public void referTo(TypeRef to, int modifiers) {
if (to.isJava())
return;
@@ -2570,10 +2580,12 @@ public class Analyzer extends Processor
}
+ @Override
public void method(Clazz.MethodDef defined) {
member = defined;
}
+ @Override
public void field(Clazz.FieldDef defined) {
member = defined;
}
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Annotation.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Annotation.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Annotation.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Annotation.java Tue Aug 7 10:57:21 2012
@@ -34,6 +34,7 @@ public class Annotation {
return policy;
}
+ @Override
public String toString() {
return name + ":" + member + ":" + policy + ":" + elements;
}
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Builder.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Builder.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Builder.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Builder.java Tue Aug 7 10:57:21 2012
@@ -238,7 +238,10 @@ public class Builder extends Analyzer {
f = new File(f, "MANIFEST.MF");
}
f.delete();
- f.getParentFile().mkdirs();
+ File fp = f.getParentFile();
+ if (!fp.exists() && !fp.mkdirs()) {
+ throw new IOException("Could not create directory " + fp);
+ }
OutputStream out = new FileOutputStream(f);
try {
Jar.writeManifest(dot.getManifest(), out);
@@ -281,6 +284,7 @@ public class Builder extends Analyzer {
/**
* Answer extra packages. In this case we implement conditional package. Any
*/
+ @Override
protected Jar getExtra() throws Exception {
Parameters conditionals = getParameters(CONDITIONAL_PACKAGE);
if (conditionals.isEmpty())
@@ -315,6 +319,7 @@ public class Builder extends Analyzer {
* the setup. We do not want to cleanup if we are going to verify.
*/
+ @Override
public void analyze() throws Exception {
super.analyze();
cleanupVersion(getImports(), null);
@@ -1078,6 +1083,7 @@ public class Builder extends Analyzer {
sourcePath.add(cp);
}
+ @Override
public void close() {
super.close();
}
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/BundleId.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/BundleId.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/BundleId.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/BundleId.java Tue Aug 7 10:57:21 2012
@@ -24,10 +24,12 @@ public class BundleId implements Compara
return Verifier.isVersion(version) && Verifier.isBsn(bsn);
}
+ @Override
public boolean equals(Object o) {
return this == o || ((o instanceof BundleId) && compareTo((BundleId) o) == 0);
}
+ @Override
public int hashCode() {
return bsn.hashCode() ^ version.hashCode();
}
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Clazz.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Clazz.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Clazz.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Clazz.java Tue Aug 7 10:57:21 2012
@@ -251,11 +251,13 @@ public class Clazz {
this.descriptor = analyzer.getDescriptor(descriptor);
}
+ @Override
public String getName() {
return name;
}
+ @Override
public TypeRef getType() {
return descriptor.getType();
}
@@ -290,6 +292,7 @@ public class Clazz {
return objectDescriptorToFQN(returnType);
}
+ @Override
public TypeRef[] getPrototype() {
return null;
}
@@ -297,6 +300,7 @@ public class Clazz {
return signature;
}
+ @Override
public String toString() {
return name;
}
@@ -311,6 +315,7 @@ public class Clazz {
return name.equals("<init>") || name.equals("<clinit>");
}
+ @Override
public TypeRef[] getPrototype() {
return descriptor.getPrototype();
}
@@ -335,16 +340,18 @@ public class Clazz {
}
+ @Override
public String getName() {
if (interf)
return "<implements>";
- else
- return "<extends>";
+ return "<extends>";
}
+ @Override
public TypeRef getType() {
return type;
}
+ @Override
public TypeRef[] getPrototype() {
return null;
}
@@ -1527,6 +1534,7 @@ public class Clazz {
return clazz.is(query, instr, analyzer);
}
+ @Override
public String toString() {
return className.getFQN();
}
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/CombinedResource.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/CombinedResource.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/CombinedResource.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/CombinedResource.java Tue Aug 7 10:57:21 2012
@@ -10,6 +10,7 @@ public class CombinedResource extends Wr
@Override
public void write(final OutputStream out) throws IOException, Exception {
OutputStream unclosable = new FilterOutputStream(out) {
+ @Override
public void close() {
// Ignore
}
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Descriptors.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Descriptors.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Descriptors.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Descriptors.java Tue Aug 7 10:57:21 2012
@@ -95,6 +95,7 @@ public class Descriptors {
return java;
}
+ @Override
public String toString() {
return fqn;
}
@@ -111,11 +112,13 @@ public class Descriptors {
return fqn.compareTo(other.fqn);
}
+ @Override
public boolean equals(Object o) {
assert o instanceof PackageRef;
return o == this;
}
+ @Override
public int hashCode() {
return super.hashCode();
}
@@ -207,6 +210,7 @@ public class Descriptors {
return packageRef.isJava();
}
+ @Override
public String toString() {
return fqn;
}
@@ -215,6 +219,7 @@ public class Descriptors {
return fqn.equals("java.lang.Object");
}
+ @Override
public boolean equals(Object other) {
assert other instanceof TypeRef;
return this == other;
@@ -268,6 +273,7 @@ public class Descriptors {
return component.getClassRef();
}
+ @Override
public boolean equals(Object other) {
if (other == null || other.getClass() != getClass())
return false;
@@ -287,6 +293,7 @@ public class Descriptors {
return component.isJava();
}
+ @Override
public String toString() {
return component.toString() + "[]";
}
@@ -457,6 +464,7 @@ public class Descriptors {
return prototype;
}
+ @Override
public boolean equals(Object other) {
if (other == null || other.getClass() != getClass())
return false;
@@ -464,10 +472,12 @@ public class Descriptors {
return Arrays.equals(prototype, ((Descriptor) other).prototype) && type == ((Descriptor) other).type;
}
+ @Override
public int hashCode() {
return prototype == null ? type.hashCode() : type.hashCode() ^ Arrays.hashCode(prototype);
}
+ @Override
public String toString() {
return descriptor;
}
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/EmbeddedResource.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/EmbeddedResource.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/EmbeddedResource.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/EmbeddedResource.java Tue Aug 7 10:57:21 2012
@@ -23,6 +23,7 @@ public class EmbeddedResource implements
out.write(data);
}
+ @Override
public String toString() {
return ":" + data.length + ":";
}
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/FileResource.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/FileResource.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/FileResource.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/FileResource.java Tue Aug 7 10:57:21 2012
@@ -19,6 +19,7 @@ public class FileResource implements Res
traverse(jar, directory.getAbsolutePath().length(), directory, doNotCopy);
}
+ @Override
public String toString() {
return ":" + file.getName() + ":";
}
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Instruction.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Instruction.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Instruction.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Instruction.java Tue Aug 7 10:57:21 2012
@@ -145,6 +145,7 @@ public class Instruction {
return input;
}
+ @Override
public String toString() {
return input;
}
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Instructions.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Instructions.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Instructions.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Instructions.java Tue Aug 7 10:57:21 2012
@@ -145,6 +145,7 @@ public class Instructions implements Map
return map.values();
}
+ @Override
public String toString() {
return map == null ? "{}" : map.toString();
}
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Jar.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Jar.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Jar.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Jar.java Tue Aug 7 10:57:21 2012
@@ -97,6 +97,7 @@ public class Jar implements Closeable {
this.name = name;
}
+ @Override
public String toString() {
return "Jar:" + name;
}
@@ -768,14 +769,19 @@ public class Jar implements Closeable {
public void expand(File dir) throws Exception {
check();
dir = dir.getAbsoluteFile();
- dir.mkdirs();
+ if (!dir.exists() && !dir.mkdirs()) {
+ throw new IOException("Could not create directory " + dir);
+ }
if (!dir.isDirectory()) {
throw new IllegalArgumentException("Not a dir: " + dir.getAbsolutePath());
}
for (Map.Entry<String,Resource> entry : getResources().entrySet()) {
File f = getFile(dir, entry.getKey());
- f.getParentFile().mkdirs();
+ File fp = f.getParentFile();
+ if (!fp.exists() && !fp.mkdirs()) {
+ throw new IOException("Could not create directory " + fp);
+ }
IO.copy(entry.getValue().openInputStream(), f);
}
}
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/JarResource.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/JarResource.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/JarResource.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/JarResource.java Tue Aug 7 10:57:21 2012
@@ -10,10 +10,12 @@ public class JarResource extends WriteRe
this.jar = jar;
}
+ @Override
public long lastModified() {
return jar.lastModified();
}
+ @Override
public void write(OutputStream out) throws Exception {
try {
jar.write(out);
@@ -28,6 +30,7 @@ public class JarResource extends WriteRe
return jar;
}
+ @Override
public String toString() {
return ":" + jar.getName() + ":";
}
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Macro.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Macro.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Macro.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Macro.java Tue Aug 7 10:57:21 2012
@@ -895,6 +895,7 @@ public class Macro {
return previous.contains(key);
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
String del = "[";
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Packages.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Packages.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Packages.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Packages.java Tue Aug 7 10:57:21 2012
@@ -179,6 +179,7 @@ public class Packages implements Map<Pac
return getByFQN(s) != null;
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
append(sb);
@@ -219,11 +220,13 @@ public class Packages implements Map<Pac
return deflt;
}
+ @Override
@Deprecated
public boolean equals(Object other) {
return super.equals(other);
}
+ @Override
@Deprecated
public int hashCode() {
return super.hashCode();
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/PreprocessResource.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/PreprocessResource.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/PreprocessResource.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/PreprocessResource.java Tue Aug 7 10:57:21 2012
@@ -13,6 +13,7 @@ public class PreprocessResource extends
setExtra(resource.getExtra());
}
+ @Override
protected byte[] getBytes() throws Exception {
ByteArrayOutputStream bout = new ByteArrayOutputStream(2000);
OutputStreamWriter osw = new OutputStreamWriter(bout, Constants.DEFAULT_CHARSET);
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Processor.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Processor.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Processor.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Processor.java Tue Aug 7 10:57:21 2012
@@ -127,12 +127,10 @@ public class Processor extends Domain im
try {
if (p.isFailOk())
return p.warning(string, args);
- else {
- String s = formatArrays(string, args == null ? new Object[0] : args);
- if (!p.errors.contains(s))
- p.errors.add(s);
- return location(s);
- }
+ String s = formatArrays(string, args == null ? new Object[0] : args);
+ if (!p.errors.contains(s))
+ p.errors.add(s);
+ return location(s);
}
finally {
p.signal();
@@ -160,13 +158,11 @@ public class Processor extends Domain im
if (p.isFailOk()) {
return p.warning(string + ": " + t, args);
}
- else {
- p.errors.add("Exception: " + t.getMessage());
- String s = formatArrays(string, args == null ? new Object[0] : args);
- if (!p.errors.contains(s))
- p.errors.add(s);
- return location(s);
- }
+ p.errors.add("Exception: " + t.getMessage());
+ String s = formatArrays(string, args == null ? new Object[0] : args);
+ if (!p.errors.contains(s))
+ p.errors.add(s);
+ return location(s);
}
finally {
p.signal();
@@ -408,6 +404,7 @@ public class Processor extends Domain im
return plugin;
}
+ @Override
public boolean isFailOk() {
String v = getProperty(Analyzer.FAIL_OK, null);
return v != null && v.equalsIgnoreCase("true");
@@ -1184,6 +1181,7 @@ public class Processor extends Domain im
super.addURL(url);
}
+ @Override
public Class< ? > loadClass(String name) throws NoClassDefFoundError {
try {
Class< ? > c = super.loadClass(name);
@@ -1581,6 +1579,7 @@ public class Processor extends Domain im
* Printout of the status of this processor for toString()
*/
+ @Override
public String toString() {
try {
StringBuilder sb = new StringBuilder();
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/URLResource.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/URLResource.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/URLResource.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/URLResource.java Tue Aug 7 10:57:21 2012
@@ -18,6 +18,7 @@ public class URLResource implements Reso
return url.openStream();
}
+ @Override
public String toString() {
return ":" + url.getPath() + ":";
}
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Verifier.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Verifier.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Verifier.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/Verifier.java Tue Aug 7 10:57:21 2012
@@ -47,6 +47,7 @@ public class Verifier extends Processor
this.target = target;
}
+ @Override
public String toString() {
return name + "(" + target + ")";
}
@@ -814,6 +815,7 @@ public class Verifier extends Processor
return true;
}
+ @Override
public String getProperty(String key, String deflt) {
if (properties == null)
return deflt;
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/WriteResource.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/WriteResource.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/WriteResource.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/WriteResource.java Tue Aug 7 10:57:21 2012
@@ -10,6 +10,7 @@ public abstract class WriteResource impl
PipedInputStream pin = new PipedInputStream();
final PipedOutputStream pout = new PipedOutputStream(pin);
Thread t = new Thread() {
+ @Override
public void run() {
try {
write(pout);
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/ZipResource.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/ZipResource.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/ZipResource.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/ZipResource.java Tue Aug 7 10:57:21 2012
@@ -24,6 +24,7 @@ public class ZipResource implements Reso
return zip.getInputStream(entry);
}
+ @Override
public String toString() {
return ":" + zip.getName() + "(" + entry.getName() + "):";
}
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/resource/Filters.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/resource/Filters.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/resource/Filters.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/osgi/resource/Filters.java Tue Aug 7 10:57:21 2012
@@ -2,7 +2,6 @@ package aQute.bnd.osgi.resource;
import org.osgi.framework.namespace.*;
-import aQute.bnd.osgi.*;
import aQute.bnd.version.*;
import aQute.libg.filters.*;
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/repo/eclipse/EclipseRepo.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/repo/eclipse/EclipseRepo.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/repo/eclipse/EclipseRepo.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/repo/eclipse/EclipseRepo.java Tue Aug 7 10:57:21 2012
@@ -85,7 +85,10 @@ public class EclipseRepo implements Plug
private void write(File index, Map<String, ? extends Map<String,String>> map) throws Exception {
String s = Processor.printClauses(map);
- index.getParentFile().mkdirs();
+ File ip = index.getParentFile();
+ if (!ip.exists() && !ip.mkdirs()) {
+ throw new IOException("Could not create directory " + ip);
+ }
PrintWriter fw = IO.writer(index);
try {
fw.write(s);
@@ -166,7 +169,7 @@ public class EclipseRepo implements Plug
return result;
}
- public File put(Jar jar) throws Exception {
+ public PutResult put(InputStream stream, PutOptions options) throws Exception {
return null;
}
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/service/Deploy.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/service/Deploy.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/service/Deploy.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/service/Deploy.java Tue Aug 7 10:57:21 2012
@@ -1,11 +1,12 @@
package aQute.bnd.service;
+import java.io.InputStream;
+
import aQute.bnd.build.*;
-import aQute.bnd.osgi.*;
/**
* Deploy this artifact to maven.
*/
public interface Deploy {
- boolean deploy(Project project, Jar jar) throws Exception;
+ boolean deploy(Project project, String jarName, InputStream jarStream) throws Exception;
}
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/service/RepositoryPlugin.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/service/RepositoryPlugin.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/service/RepositoryPlugin.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/service/RepositoryPlugin.java Tue Aug 7 10:57:21 2012
@@ -1,9 +1,9 @@
package aQute.bnd.service;
import java.io.*;
+import java.net.*;
import java.util.*;
-import aQute.bnd.osgi.*;
import aQute.bnd.version.*;
public interface RepositoryPlugin {
@@ -12,6 +12,83 @@ public interface RepositoryPlugin {
}
/**
+ * Options used to steer the put operation
+ */
+ public class PutOptions {
+ /**
+ * The <b>SHA1</b> digest of the artifact to put into the repository.<br/>
+ * <br/>
+ * When specified the digest of the <b>fetched</b> artifact will be
+ * calculated and verified against this digest, <b>before</b> putting
+ * the artifact into the repository.<br/>
+ * <br/>
+ * An exception is thrown if the specified digest and the calculated
+ * digest do not match.
+ */
+ public byte[] digest = null;
+
+ /**
+ * Allow the implementation to change the artifact.<br/>
+ * <br/>
+ * When set to true the implementation is allowed to change the artifact
+ * when putting it into the repository.<br/>
+ * <br/>
+ * An exception is thrown when set to false and the implementation can't
+ * put the artifact into the repository without changing it.
+ */
+ public boolean allowArtifactChange = false;
+
+ /**
+ * Generate a <b>SHA1</b> digest.<br/>
+ * <br/>
+ * When set to true the implementation generates a digest of the
+ * artifact as it is put into the repository and returns that digest in
+ * the result.
+ */
+ public boolean generateDigest = false;
+
+ /**
+ * Create a 'latest' artifact when it did not exist.<br/>
+ * <br/>
+ * When set to true the implementation is requested to create a 'latest'
+ * artifact.
+ */
+ public boolean createLatest = false;
+ }
+
+ /**
+ * Results returned by the put operation
+ */
+ public class PutResult {
+ /**
+ * The artifact as it was put in the repository.<br/>
+ * <br/>
+ * This can be a URI to the artifact (when it was put into the
+ * repository), or null when the artifact was not put into the
+ * repository (for example because it was already in the repository).
+ */
+ public URI artifact = null;
+
+ /**
+ * The 'latest' artifact as it was put in the repository.<br/>
+ * <br/>
+ * Only set when {@link PutOptions#createLatest} was set to true and the
+ * 'latest' artifact did not exist, or when the 'latest' artifact did
+ * exists and was older than the artifact being put in the repository.
+ */
+ public URI latest = null;
+
+ /**
+ * The <b>SHA1</b> digest of the artifact as it was put into the
+ * repository.<br/>
+ * <br/>
+ * This will be null when {@link PutOptions#generateDigest} was null, or
+ * when {@link #artifact} is null.
+ */
+ public byte[] digest = null;
+ }
+
+ /**
* Return a URL to a matching version of the given bundle.
*
* @param bsn
@@ -36,12 +113,29 @@ public interface RepositoryPlugin {
boolean canWrite();
/**
- * Put a JAR file in the repository.
+ * Put an artifact (from the InputStream) into the repository.<br/>
+ * <br/>
+ * There is NO guarantee that the artifact on the input stream has not been
+ * modified after it's been put in the repository since that is dependent on
+ * the implementation of the repository (see
+ * {@link RepositoryPlugin.PutOptions#allowArtifactChange}).
*
- * @param jar
+ * @param stream
+ * The input stream with the artifact
+ * @param options
+ * The put options. See {@link RepositoryPlugin.PutOptions}
+ * @return The result of the put, never null. See
+ * {@link RepositoryPlugin.PutResult}
* @throws Exception
+ * When the repository root directory doesn't exist, when the
+ * repository is read-only, when the specified checksum doesn't
+ * match the checksum of the fetched artifact (see
+ * {@link RepositoryPlugin.PutOptions#digest}), when the
+ * implementation wants to modify the artifact but isn't allowed
+ * (see {@link RepositoryPlugin.PutOptions#allowArtifactChange}
+ * ), or when another error has occurred.
*/
- File put(Jar jar) throws Exception;
+ PutResult put(InputStream stream, PutOptions options) throws Exception;
/**
* Return a list of bsns that are present in the repository.
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/service/packageinfo
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/service/packageinfo?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/service/packageinfo (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/service/packageinfo Tue Aug 7 10:57:21 2012
@@ -1 +1 @@
-version 2.0.0
+version 3.0.0
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/service/repository/MinimalRepository.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/service/repository/MinimalRepository.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/service/repository/MinimalRepository.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/service/repository/MinimalRepository.java Tue Aug 7 10:57:21 2012
@@ -10,7 +10,7 @@ import aQute.service.reporter.*;
public interface MinimalRepository {
public enum Gestalt {
ADD, REMOTE
- };
+ }
Report add(File f) throws Exception;
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/signing/JartoolSigner.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/signing/JartoolSigner.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/signing/JartoolSigner.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/signing/JartoolSigner.java Tue Aug 7 10:57:21 2012
@@ -119,6 +119,7 @@ public class JartoolSigner implements Pl
final StringBuilder sb = new StringBuilder();
Thread tin = new Thread() {
+ @Override
public void run() {
try {
BufferedReader rdr = new BufferedReader(new InputStreamReader(in, Constants.DEFAULT_CHARSET));
Modified: felix/trunk/bundleplugin/src/main/java/aQute/bnd/version/Version.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/aQute/bnd/version/Version.java?rev=1370165&r1=1370164&r2=1370165&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/aQute/bnd/version/Version.java (original)
+++ felix/trunk/bundleplugin/src/main/java/aQute/bnd/version/Version.java Tue Aug 7 10:57:21 2012
@@ -106,6 +106,7 @@ public class Version implements Comparab
return qualifier.compareTo(o.qualifier);
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(major);
@@ -120,6 +121,7 @@ public class Version implements Comparab
return sb.toString();
}
+ @Override
public boolean equals(Object ot) {
if (!(ot instanceof Version))
return false;
@@ -127,6 +129,7 @@ public class Version implements Comparab
return compareTo((Version) ot) == 0;
}
+ @Override
public int hashCode() {
return major * 97 ^ minor * 13 ^ micro + (qualifier == null ? 97 : qualifier.hashCode());
}