You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by rw...@apache.org on 2014/04/16 09:50:53 UTC
svn commit: r1587825 - in /stanbol/trunk: ./ entityhub/
entityhub/indexing/core/
entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/destination/
entityhub/indexing/core/src/test/java/org/apache/stanbol/entityhub/indexing/c...
Author: rwesten
Date: Wed Apr 16 07:50:52 2014
New Revision: 1587825
URL: http://svn.apache.org/r1587825
Log:
merged fix for STANBOL-1304 from 0.12 to trunk
Added:
stanbol/trunk/entityhub/indexing/core/src/test/java/org/apache/stanbol/entityhub/indexing/core/destination/
- copied from r1587824, stanbol/branches/release-0.12/entityhub/indexing/core/src/test/java/org/apache/stanbol/entityhub/indexing/core/destination/
stanbol/trunk/entityhub/indexing/core/src/test/resources/testOsgiConfiguration/
- copied from r1587824, stanbol/branches/release-0.12/entityhub/indexing/core/src/test/resources/testOsgiConfiguration/
Modified:
stanbol/trunk/ (props changed)
stanbol/trunk/entityhub/ (props changed)
stanbol/trunk/entityhub/indexing/core/pom.xml
stanbol/trunk/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/destination/OsgiConfigurationUtil.java
Propchange: stanbol/trunk/
------------------------------------------------------------------------------
Merged /stanbol/branches/release-0.12:r1587824
Propchange: stanbol/trunk/entityhub/
------------------------------------------------------------------------------
Merged /stanbol/branches/release-0.12/entityhub:r1587824
Modified: stanbol/trunk/entityhub/indexing/core/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/entityhub/indexing/core/pom.xml?rev=1587825&r1=1587824&r2=1587825&view=diff
==============================================================================
--- stanbol/trunk/entityhub/indexing/core/pom.xml (original)
+++ stanbol/trunk/entityhub/indexing/core/pom.xml Wed Apr 16 07:50:52 2014
@@ -135,8 +135,8 @@
</dependency>
<dependency>
<groupId>biz.aQute</groupId> <!-- used to generate bundles -->
- <artifactId>bndlib</artifactId>
- <version>1.43.0</version>
+ <artifactId>bnd</artifactId>
+ <version>1.50.0</version>
</dependency>
<!-- For Testing -->
<dependency>
Modified: stanbol/trunk/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/destination/OsgiConfigurationUtil.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/destination/OsgiConfigurationUtil.java?rev=1587825&r1=1587824&r2=1587825&view=diff
==============================================================================
--- stanbol/trunk/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/destination/OsgiConfigurationUtil.java (original)
+++ stanbol/trunk/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/destination/OsgiConfigurationUtil.java Wed Apr 16 07:50:52 2014
@@ -255,24 +255,21 @@ public final class OsgiConfigurationUtil
try {
builder.addClasspath(new File(config.getDestinationFolder(),CONFIG_ROOT));
} catch (IOException e) {
- log.warn("Unable to build OSGI Bundle for Indexed Referenced Site "+config.getName(),e);
+ log.warn("(builder.addClasspath) Unable to build OSGI Bundle for Indexed Referenced Site "+config.getName(),e);
builder.close();
+ //?? why not throwing an exception here ??
return;
}
- Jar jar;
try {
- jar = builder.build();
+ Jar jar = builder.build();
+ jar.write(new File(config.getDistributionFolder(),
+ CONFIG_PACKAGE+config.getName()+"-1.0.0.jar"));
} catch (Exception e) {
- log.warn("Unable to build OSGI Bundle for Indexed Referenced Site "+config.getName(),e);
+ log.warn("(builder.build) Unable to build OSGI Bundle for Indexed Referenced Site "+config.getName(),e);
+ //?? why not throwing an exception here ??
return;
} finally {
builder.close();
}
- try {
- jar.write(new File(config.getDistributionFolder(),
- CONFIG_PACKAGE+config.getName()+"-1.0.0.jar"));
- } catch (Exception e) {
- log.warn("Unable to write OSGI Bundle for Indexed Referenced Site "+config.getName(),e);
- }
}
}