You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ha...@apache.org on 2015/11/25 02:55:29 UTC
[19/21] incubator-brooklyn git commit: [BROOKLYN-183] Drop unneeded
code
[BROOKLYN-183] Drop unneeded code
The settings in pom.xml are inherited from the parent and not needed here.
javax-servlet-api.version is already provided by parent pom.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/943c1371
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/943c1371
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/943c1371
Branch: refs/heads/master
Commit: 943c1371f0ec25189c106b3a7b5bba660b497e6a
Parents: f86e2da
Author: Ciprian Ciubotariu <ch...@gmx.net>
Authored: Tue Nov 24 23:40:59 2015 +0200
Committer: Ciprian Ciubotariu <ch...@gmx.net>
Committed: Tue Nov 24 23:43:13 2015 +0200
----------------------------------------------------------------------
core/pom.xml | 2 --
.../java/org/apache/brooklyn/util/core/osgi/Osgis.java | 10 +---------
karaf/pom.xml | 2 --
usage/jsgui/pom.xml | 2 --
usage/rest-server/pom.xml | 2 --
5 files changed, 1 insertion(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/943c1371/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index f79aee7..240cc82 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -284,8 +284,6 @@
!org.apache.felix.framework,
*
</Import-Package>
- <Implementation-SHA-1>${buildNumber}</Implementation-SHA-1>
- <Implementation-Branch>${scmBranch}</Implementation-Branch>
</instructions>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/943c1371/core/src/main/java/org/apache/brooklyn/util/core/osgi/Osgis.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/osgi/Osgis.java b/core/src/main/java/org/apache/brooklyn/util/core/osgi/Osgis.java
index 8777032..7defcb6 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/osgi/Osgis.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/osgi/Osgis.java
@@ -309,9 +309,6 @@ public class Osgis {
* When running inside an OSGi container, the container framework is returned.
* When running standalone a new Apache Felix container is created.
*
- * Calling {@link #ungetFramework(Framework) } is needed in both cases, either to stop
- * the embedded framework or to release the service reference.
- *
* @param felixCacheDir
* @param clean
* @return
@@ -337,12 +334,7 @@ public class Osgis {
*/
public static void ungetFramework(Framework framework) {
final Bundle bundle = FrameworkUtil.getBundle(Osgis.class);
- if (bundle != null) {
-// // already running inside an OSGi container
-// final BundleContext ctx = bundle.getBundleContext();
-// final ServiceReference<Framework> ref = ctx.getServiceReference(Framework.class);
-// ctx.ungetService(ref);
- } else {
+ if (bundle == null) {
EmbeddedFelixFramework.stopFramework(framework);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/943c1371/karaf/pom.xml
----------------------------------------------------------------------
diff --git a/karaf/pom.xml b/karaf/pom.xml
index 0d555cd..f703864 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -37,8 +37,6 @@
<lifecycle-mapping-plugin.version>1.0.0</lifecycle-mapping-plugin.version>
- <javax-servlet-api.version>3.1.0</javax-servlet-api.version>
-
<!-- pax-exam -->
<pax.exam.version>4.5.0</pax.exam.version>
<pax.url.version>2.4.1</pax.url.version>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/943c1371/usage/jsgui/pom.xml
----------------------------------------------------------------------
diff --git a/usage/jsgui/pom.xml b/usage/jsgui/pom.xml
index 03514aa..c9631c6 100644
--- a/usage/jsgui/pom.xml
+++ b/usage/jsgui/pom.xml
@@ -276,8 +276,6 @@
</supportedProjectTypes>
<instructions>
<Web-ContextPath>/</Web-ContextPath>
- <Implementation-SHA-1>${buildNumber}</Implementation-SHA-1>
- <Implementation-Branch>${scmBranch}</Implementation-Branch>
</instructions>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/943c1371/usage/rest-server/pom.xml
----------------------------------------------------------------------
diff --git a/usage/rest-server/pom.xml b/usage/rest-server/pom.xml
index d343bfe..ff5ef1b 100644
--- a/usage/rest-server/pom.xml
+++ b/usage/rest-server/pom.xml
@@ -272,8 +272,6 @@
*
</Import-Package>
<Export-Package>org.apache.brooklyn.*</Export-Package>
- <Implementation-SHA-1>${buildNumber}</Implementation-SHA-1>
- <Implementation-Branch>${scmBranch}</Implementation-Branch>
<Web-ContextPath>/</Web-ContextPath>
<_wab>src/main/webapp</_wab>
</instructions>