You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2017/10/12 08:47:57 UTC
[1/2] karaf git commit: [KARAF-5417] Trim down distributions
Repository: karaf
Updated Branches:
refs/heads/master f56fd1bdf -> e7ca1e209
[KARAF-5417] Trim down distributions
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/e7ca1e20
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/e7ca1e20
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/e7ca1e20
Branch: refs/heads/master
Commit: e7ca1e209f02d844a481bb5d95a351aba47c8c6c
Parents: 3f1f44b
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Wed Oct 11 19:17:22 2017 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Thu Oct 12 10:47:53 2017 +0200
----------------------------------------------------------------------
assemblies/apache-karaf-minimal/pom.xml | 30 ++++++++++++--------
assemblies/apache-karaf/pom.xml | 20 ++-----------
.../java/org/apache/karaf/itests/JmsTest.java | 2 +-
.../itests/features/StandardFeaturesTest.java | 2 --
.../apache/karaf/itests/features/XATest.java | 1 +
.../resources/META-INF/plexus/components.xml | 2 ++
6 files changed, 24 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/e7ca1e20/assemblies/apache-karaf-minimal/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-karaf-minimal/pom.xml b/assemblies/apache-karaf-minimal/pom.xml
index 7133a10..4a853f7 100644
--- a/assemblies/apache-karaf-minimal/pom.xml
+++ b/assemblies/apache-karaf-minimal/pom.xml
@@ -118,25 +118,14 @@
</execution>
</executions>
<configuration>
- <installedFeatures>
- <feature>wrapper</feature>
- </installedFeatures>
<bootFeatures>
<feature>jaas</feature>
<feature>shell</feature>
<feature>feature</feature>
<feature>ssh</feature>
- <feature>management</feature>
<feature>bundle</feature>
<feature>config</feature>
- <feature>deployer</feature>
- <feature>diagnostic</feature>
- <feature>instance</feature>
- <feature>kar</feature>
<feature>log</feature>
- <feature>package</feature>
- <feature>service</feature>
- <feature>system</feature>
</bootFeatures>
<pidsToExtract>
!jmx.acl.*,
@@ -146,7 +135,24 @@
<javase>1.8</javase>
</configuration>
</plugin>
-
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>fix-distro</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target>
+ <delete dir="${project.build.directory}/assembly/system/org/eclipse" />
+ <delete dir="${project.build.directory}/assembly/system/org/ops4j/pax/logging/pax-logging-logback" />
+ </target>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/karaf/blob/e7ca1e20/assemblies/apache-karaf/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/apache-karaf/pom.xml b/assemblies/apache-karaf/pom.xml
index ca81c67..d90d55a 100644
--- a/assemblies/apache-karaf/pom.xml
+++ b/assemblies/apache-karaf/pom.xml
@@ -164,15 +164,15 @@
<configuration>
<installedFeatures>
<feature>wrapper</feature>
+ <feature>aries-blueprint</feature>
+ <feature>shell-compat</feature>
</installedFeatures>
<startupFeatures>
<feature>eventadmin</feature>
</startupFeatures>
<bootFeatures>
<feature>wrap</feature>
- <feature>aries-blueprint</feature>
<feature>shell</feature>
- <feature>shell-compat</feature>
<feature>feature</feature>
<feature>jaas</feature>
<feature>ssh</feature>
@@ -190,22 +190,6 @@
<feature>system</feature>
</bootFeatures>
<libraries>
- <library>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xerces/${xerces.version};type:=endorsed;export:=true;delegate:=true</library>
- <library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxp-api-1.4/${servicemix.specs.version};type:=endorsed;export:=true</library>
- <library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.2/${servicemix.specs.version};type:=endorsed;export:=true</library>
- <library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/${servicemix.specs.version};type:=endorsed;export:=true</library>
- <library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.saaj-api-1.3/${servicemix.specs.version};type:=endorsed;export:=true</library>
- <library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix.specs.version};type:=endorsed;export:=true</library>
- <library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.2/${servicemix.specs.version};type:=endorsed;export:=true</library>
- <library>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan/${xalan.bundle.version};type:=endorsed;export:=true</library>
- <library>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xalan-serializer/${xalan-serializer.bundle.version};type:=endorsed;export:=true</library>
- <library>mvn:javax.annotation/javax.annotation-api/1.2;type:=endorsed;export:=true</library>
-
- <library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activator/${servicemix.specs.version};type:=default;export:=true</library>
- <library>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.locator/${servicemix.specs.version};type:=default;export:=true</library>
-
- <library>mvn:net.java.dev.jna/jna/${jna.version};type:=boot;export:=false</library>
- <library>mvn:net.java.dev.jna/jna-platform/${jna.version};type:=boot;export:=false</library>
</libraries>
<javase>1.8</javase>
</configuration>
http://git-wip-us.apache.org/repos/asf/karaf/blob/e7ca1e20/itests/src/test/java/org/apache/karaf/itests/JmsTest.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/karaf/itests/JmsTest.java b/itests/src/test/java/org/apache/karaf/itests/JmsTest.java
index 29da7b1..977b087 100644
--- a/itests/src/test/java/org/apache/karaf/itests/JmsTest.java
+++ b/itests/src/test/java/org/apache/karaf/itests/JmsTest.java
@@ -60,7 +60,7 @@ public class JmsTest extends KarafTestSupport {
return new Option[] //
{
composite(super.config()), //
- features(activeMqUrl, "jms", "activemq-broker-noweb")
+ features(activeMqUrl, "jms", "activemq-broker-noweb", "shell-compat")
};
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/e7ca1e20/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java b/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java
index 4c43178..ef66667 100644
--- a/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java
+++ b/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java
@@ -32,9 +32,7 @@ public class StandardFeaturesTest extends KarafTestSupport {
public void checkInstalledFeaturesBoot() throws Exception {
System.out.println("===>checkInstalledFeaturesBoot");
assertFeatureInstalled("wrap");
- assertFeatureInstalled("aries-blueprint");
assertFeatureInstalled("shell");
- assertFeatureInstalled("shell-compat");
assertFeatureInstalled("jaas");
assertFeatureInstalled("ssh");
assertFeatureInstalled("management");
http://git-wip-us.apache.org/repos/asf/karaf/blob/e7ca1e20/itests/src/test/java/org/apache/karaf/itests/features/XATest.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/karaf/itests/features/XATest.java b/itests/src/test/java/org/apache/karaf/itests/features/XATest.java
index d005c1d..5ce83bd 100644
--- a/itests/src/test/java/org/apache/karaf/itests/features/XATest.java
+++ b/itests/src/test/java/org/apache/karaf/itests/features/XATest.java
@@ -81,6 +81,7 @@ public class XATest extends KarafTestSupport {
"pax-jdbc-derby",
"pax-jdbc-pool-transx",
"jdbc",
+ "shell-compat",
"camel-blueprint",
"camel-spring",
"camel-sql",
http://git-wip-us.apache.org/repos/asf/karaf/blob/e7ca1e20/tooling/karaf-maven-plugin/src/main/resources/META-INF/plexus/components.xml
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/resources/META-INF/plexus/components.xml b/tooling/karaf-maven-plugin/src/main/resources/META-INF/plexus/components.xml
index c86b142..2891bb8 100644
--- a/tooling/karaf-maven-plugin/src/main/resources/META-INF/plexus/components.xml
+++ b/tooling/karaf-maven-plugin/src/main/resources/META-INF/plexus/components.xml
@@ -121,6 +121,8 @@
</process-resources>
<compile>
</compile>
+ <prepare-package>
+ </prepare-package>
<package>
org.apache.karaf.tooling:karaf-maven-plugin:archive
</package>
[2/2] karaf git commit: [KARAF-5416] Remove support for ext and
endorsed libraries for Java 9 compatibility
Posted by gn...@apache.org.
[KARAF-5416] Remove support for ext and endorsed libraries for Java 9 compatibility
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/3f1f44b6
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/3f1f44b6
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/3f1f44b6
Branch: refs/heads/master
Commit: 3f1f44b6521f058abea6f6df19ce03a4c353c991
Parents: f56fd1b
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Wed Oct 11 19:17:08 2017 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Thu Oct 12 10:47:53 2017 +0200
----------------------------------------------------------------------
assemblies/features/base/pom.xml | 10 -
.../main/filtered-resources/resources/bin/karaf | 6 -
.../filtered-resources/resources/bin/karaf.bat | 2 -
.../main/resources/resources/lib/boot/README | 21 --
.../resources/resources/lib/endorsed/README | 23 ---
assemblies/features/framework/pom.xml | 5 -
exception/NOTICE | 67 -------
exception/pom.xml | 38 ----
.../src/main/java/java/lang/Exception.java | 194 -------------------
.../asciidoc/user-guide/os-integration.adoc | 2 -
pom.xml | 6 -
.../apache/karaf/profile/assembly/Builder.java | 4 +
.../wrapper/internal/unix/karaf-wrapper.conf | 4 +-
.../wrapper/internal/windows/karaf-wrapper.conf | 4 +-
.../internal/windows64/karaf-wrapper.conf | 4 +-
15 files changed, 7 insertions(+), 383 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/3f1f44b6/assemblies/features/base/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/base/pom.xml b/assemblies/features/base/pom.xml
index d14c041..072c1bf 100644
--- a/assemblies/features/base/pom.xml
+++ b/assemblies/features/base/pom.xml
@@ -44,11 +44,6 @@
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.exception</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf</groupId>
<artifactId>org.apache.karaf.client</artifactId>
<scope>runtime</scope>
</dependency>
@@ -135,11 +130,6 @@
<outputDirectory>target/classes/resources/system/org/apache/karaf/org.apache.karaf.client/${project.version}</outputDirectory>
</artifactItem>
<artifactItem>
- <groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.exception</artifactId>
- <outputDirectory>target/classes/resources/lib/endorsed</outputDirectory>
- </artifactItem>
- <artifactItem>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
<outputDirectory>target/classes/resources/system/org/apache/felix/org.apache.felix.framework/${felix.framework.version}</outputDirectory>
http://git-wip-us.apache.org/repos/asf/karaf/blob/3f1f44b6/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
----------------------------------------------------------------------
diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf b/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
index 674b8d0..a70a896 100644
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf
@@ -155,12 +155,8 @@ run() {
if [ "x$CHECK_ROOT_INSTANCE_RUNNING" = "x" ]; then
CHECK_ROOT_INSTANCE_RUNNING=true
fi
- JAVA_ENDORSED_DIRS="${JAVA_HOME}/jre/lib/endorsed:${JAVA_HOME}/lib/endorsed:${KARAF_HOME}/lib/endorsed"
- JAVA_EXT_DIRS="${JAVA_HOME}/jre/lib/ext:${JAVA_HOME}/lib/ext:${KARAF_HOME}/lib/ext"
if ${cygwin}; then
JAVA_HOME=$(cygpath --path --windows "${JAVA_HOME}")
- JAVA_ENDORSED_DIRS=$(cygpath --path --windows "${JAVA_ENDORSED_DIRS}")
- JAVA_EXT_DIRS=$(cygpath --path --windows "${JAVA_EXT_DIRS}")
fi
convertPaths
cd "${KARAF_BASE}" || exit 2
@@ -294,8 +290,6 @@ run() {
${MAIN} "$@"
else
${KARAF_EXEC} "${JAVA}" ${JAVA_OPTS} \
- -Djava.endorsed.dirs="${JAVA_ENDORSED_DIRS}" \
- -Djava.ext.dirs="${JAVA_EXT_DIRS}" \
-Dkaraf.instances="${KARAF_HOME}/instances" \
-Dkaraf.home="${KARAF_HOME}" \
-Dkaraf.base="${KARAF_BASE}" \
http://git-wip-us.apache.org/repos/asf/karaf/blob/3f1f44b6/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf.bat
----------------------------------------------------------------------
diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf.bat b/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf.bat
index 1f95c21..0cb31c2 100644
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf.bat
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf.bat
@@ -414,8 +414,6 @@ if "%KARAF_PROFILER%" == "" goto :RUN
) else (
"%JAVA%" %JAVA_OPTS% %OPTS% ^
-classpath "%CLASSPATH%" ^
- -Djava.endorsed.dirs="%JAVA_HOME%\jre\lib\endorsed;%JAVA_HOME%\lib\endorsed;%KARAF_HOME%\lib\endorsed" ^
- -Djava.ext.dirs="%JAVA_HOME%\jre\lib\ext;%JAVA_HOME%\lib\ext;%KARAF_HOME%\lib\ext" ^
-Dkaraf.instances="%KARAF_HOME%\instances" ^
-Dkaraf.home="%KARAF_HOME%" ^
-Dkaraf.base="%KARAF_BASE%" ^
http://git-wip-us.apache.org/repos/asf/karaf/blob/3f1f44b6/assemblies/features/base/src/main/resources/resources/lib/boot/README
----------------------------------------------------------------------
diff --git a/assemblies/features/base/src/main/resources/resources/lib/boot/README b/assemblies/features/base/src/main/resources/resources/lib/boot/README
deleted file mode 100644
index b3a06ce..0000000
--- a/assemblies/features/base/src/main/resources/resources/lib/boot/README
+++ /dev/null
@@ -1,21 +0,0 @@
-################################################################################
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-################################################################################
-
-Any jar in this folder will be added to the classpath by the JVM and will be
-available to the Main class. Custom locking libraries can be added here.
http://git-wip-us.apache.org/repos/asf/karaf/blob/3f1f44b6/assemblies/features/base/src/main/resources/resources/lib/endorsed/README
----------------------------------------------------------------------
diff --git a/assemblies/features/base/src/main/resources/resources/lib/endorsed/README b/assemblies/features/base/src/main/resources/resources/lib/endorsed/README
deleted file mode 100644
index 0665a52..0000000
--- a/assemblies/features/base/src/main/resources/resources/lib/endorsed/README
+++ /dev/null
@@ -1,23 +0,0 @@
-################################################################################
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-################################################################################
-
-This directory is the Java endorsed directory.
-Any jar in this folder will be used to override classes defined by the JVM.
-For more information, see:
- http://download.oracle.com/javase/6/docs/technotes/guides/standards/
http://git-wip-us.apache.org/repos/asf/karaf/blob/3f1f44b6/assemblies/features/framework/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/framework/pom.xml b/assemblies/features/framework/pom.xml
index 61525b8..a55051c 100644
--- a/assemblies/features/framework/pom.xml
+++ b/assemblies/features/framework/pom.xml
@@ -51,11 +51,6 @@
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.exception</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf</groupId>
<artifactId>org.apache.karaf.client</artifactId>
<scope>runtime</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/karaf/blob/3f1f44b6/exception/NOTICE
----------------------------------------------------------------------
diff --git a/exception/NOTICE b/exception/NOTICE
deleted file mode 100644
index f1f81e0..0000000
--- a/exception/NOTICE
+++ /dev/null
@@ -1,67 +0,0 @@
-Apache Karaf
-Copyright 2010-2014 The Apache Software Foundation
-
-
-I. Included Software
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2010).
-Licensed under the Apache License 2.0.
-
-This product includes software developed at
-OW2 (http://www.ow2.org/).
-Licensed under the BSD License.
-
-This product includes software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
-
-This product includes software developed at
-Eclipse Foundation (http://www.eclipse.org/).
-Licensed under the EPL.
-
-This product includes software written by
-Antony Lesuisse.
-Licensed under Public Domain.
-
-
-II. Used Software
-
-This product uses software developed at
-FUSE Source (http://www.fusesource.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-AOP Alliance (http://aopalliance.sourceforge.net/).
-Licensed under the Public Domain.
-
-This product uses software developed at
-Tanuki Software (http://www.tanukisoftware.com/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-Jasypt (http://jasypt.sourceforge.net/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-JLine (https://github.com/jline/).
-Licensed under the BSD License.
-
-This product uses software developed at
-SLF4J (http://www.slf4j.org/).
-Licensed under the MIT License.
-
-This product uses software developed at
-SpringSource (http://www.springsource.org/).
-Licensed under the Apache License 2.0.
-
-III. License Summary
-- Apache License 2.0
-- BSD License
-- EPL License
-- MIT License
http://git-wip-us.apache.org/repos/asf/karaf/blob/3f1f44b6/exception/pom.xml
----------------------------------------------------------------------
diff --git a/exception/pom.xml b/exception/pom.xml
deleted file mode 100644
index 370ddb6..0000000
--- a/exception/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.karaf</groupId>
- <artifactId>karaf</artifactId>
- <version>4.2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>org.apache.karaf.exception</artifactId>
- <name>Apache Karaf :: Exception</name>
-
- <properties>
- <appendedResourcesDirectory>${basedir}/../etc/appended-resources</appendedResourcesDirectory>
- </properties>
-
-</project>
http://git-wip-us.apache.org/repos/asf/karaf/blob/3f1f44b6/exception/src/main/java/java/lang/Exception.java
----------------------------------------------------------------------
diff --git a/exception/src/main/java/java/lang/Exception.java b/exception/src/main/java/java/lang/Exception.java
deleted file mode 100644
index 940658b..0000000
--- a/exception/src/main/java/java/lang/Exception.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package java.lang;
-
-import java.lang.reflect.Field;
-import java.lang.ref.Reference;
-import java.lang.ref.WeakReference;
-
-import javax.xml.bind.annotation.XmlTransient;
-
-
-/**
- * {@code Exception} is the superclass of all classes that represent recoverable
- * exceptions. When exceptions are thrown, they may be caught by application
- * code.
- *
- * @see Throwable
- * @see Error
- * @see RuntimeException
- */
-public class Exception extends Throwable {
- private static final long serialVersionUID = -3387516993124229948L;
-
- private transient Reference<Class<?>>[] classContext = null;
-
- /**
- * Constructs a new {@code Exception} that includes the current stack trace.
- */
- public Exception() {
- super();
- initClassContext();
- }
-
- /**
- * Constructs a new {@code Exception} with the current stack trace and the
- * specified detail message.
- *
- * @param detailMessage
- * the detail message for this exception.
- */
- public Exception(String detailMessage) {
- super(detailMessage);
- initClassContext();
- }
-
- /**
- * Constructs a new {@code Exception} with the current stack trace, the
- * specified detail message and the specified cause.
- *
- * @param detailMessage
- * the detail message for this exception.
- * @param throwable
- * the cause of this exception.
- */
- public Exception(String detailMessage, Throwable throwable) {
- super(detailMessage, throwable);
- initClassContext();
- }
-
- /**
- * Constructs a new {@code Exception} with the current stack trace and the
- * specified cause.
- *
- * @param throwable
- * the cause of this exception.
- */
- public Exception(Throwable throwable) {
- super(throwable);
- initClassContext();
- }
-
- /**
- * Constructs a new exception with the specified detail message,
- * cause, suppression enabled or disabled, and writable stack
- * trace enabled or disabled.
- *
- * @param message the detail message.
- * @param cause the cause. (A {@code null} value is permitted,
- * and indicates that the cause is nonexistent or unknown.)
- * @param enableSuppression whether or not suppression is enabled
- * or disabled
- * @param writableStackTrace whether or not the stack trace should
- * be writable
- */
- protected Exception(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
- try {
- Field field = null;
- if (writableStackTrace) {
- fillInStackTrace();
- } else {
- field = Throwable.class.getDeclaredField("stackTrace");
- field.setAccessible(true);
- field.set(this, null);
- }
- field = Throwable.class.getDeclaredField("detailMessage");
- field.setAccessible(true);
- field.set(this, message);
- field = Throwable.class.getDeclaredField("cause");
- field.setAccessible(true);
- field.set(this, cause);
- if (!enableSuppression) {
- field = Throwable.class.getDeclaredField("suppressedExceptions");
- field.setAccessible(true);
- field.set(this, null);
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- initClassContext();
- }
-
- @XmlTransient
- @Deprecated
- public Class[] getClassContext() {
- Class<?>[] context = null;
- if (classContext != null) {
- context = new Class<?>[classContext.length];
- for (int i = 0; i < classContext.length; i++) {
- Class<?> c = classContext[i].get();
- context[i] = c == null ? Object.class : c;
- }
- }
- return context;
- }
-
- @SuppressWarnings("unchecked")
- private void initClassContext() {
- Class[] context = SecurityManagerEx.getInstance().getThrowableContext(this);
- if (context != null) {
- classContext = new Reference[context.length];
- for (int i = 0; i < context.length; i++) {
- classContext[i] = new WeakReference<Class<?>>(context[i]);
- }
- }
- }
-
- protected Class[] classContext() {
- Class<?>[] context = new Class<?>[classContext.length];
- for (int i = 0; i < classContext.length; i++) {
- Class<?> c = classContext[i].get();
- context[i] = c == null ? Object.class : c;
- }
- return context;
- }
-
- private static class SecurityManagerEx extends SecurityManager
- {
-
- private static SecurityManagerEx sm;
-
- public static SecurityManagerEx getInstance() {
- // No synchronized block because we don't really care
- // if multiple instances are created at some point
- if (sm == null) {
- sm = new SecurityManagerEx();
- }
- return sm;
- }
-
- public Class[] getThrowableContext(Throwable t) {
- try {
- Class[] context = getClassContext();
- int nb = 0;
- for (;;) {
- if (context[context.length - 1 - nb] == t.getClass()) {
- break;
- }
- nb++;
- }
- Class[] nc = new Class[nb];
- System.arraycopy(context, context.length - nb, nc, 0, nb);
- return nc;
- } catch (Exception e) {
- return null;
- }
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/karaf/blob/3f1f44b6/manual/src/main/asciidoc/user-guide/os-integration.adoc
----------------------------------------------------------------------
diff --git a/manual/src/main/asciidoc/user-guide/os-integration.adoc b/manual/src/main/asciidoc/user-guide/os-integration.adoc
index b6310a1..70022e4 100644
--- a/manual/src/main/asciidoc/user-guide/os-integration.adoc
+++ b/manual/src/main/asciidoc/user-guide/os-integration.adoc
@@ -291,8 +291,6 @@ wrapper.java.additional.4=-Dkaraf.etc=%KARAF_ETC%
wrapper.java.additional.5=-Dcom.sun.management.jmxremote
wrapper.java.additional.6=-Dkaraf.startLocalConsole=false
wrapper.java.additional.7=-Dkaraf.startRemoteShell=true
-wrapper.java.additional.8=-Djava.endorsed.dirs=%JAVA_HOME%/jre/lib/endorsed:%JAVA_HOME%/lib/endorsed:%KARAF_HOME%/lib/endorsed
-wrapper.java.additional.9=-Djava.ext.dirs=%JAVA_HOME%/jre/lib/ext:%JAVA_HOME%/lib/ext:%KARAF_HOME%/lib/ext
# Uncomment to enable jmx
#wrapper.java.additional.n=-Dcom.sun.management.jmxremote.port=1616
http://git-wip-us.apache.org/repos/asf/karaf/blob/3f1f44b6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d5afc90..b57513b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,6 @@
<module>web</module>
<module>wrapper</module>
<module>webconsole</module>
- <module>exception</module>
<module>scheduler</module>
<module>scr</module>
<module>diagnostic</module>
@@ -391,11 +390,6 @@
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>org.apache.karaf.exception</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf</groupId>
<artifactId>org.apache.karaf.client</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/karaf/blob/3f1f44b6/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java b/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
index c6389ad..01f9a4a 100644
--- a/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
+++ b/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
@@ -715,6 +715,10 @@ public class Builder {
}
final String type = clause.getDirective(LIBRARY_CLAUSE_TYPE) != null
? clause.getDirective(LIBRARY_CLAUSE_TYPE) : Library.TYPE_DEFAULT;
+ if (type == Library.TYPE_ENDORSED || type == Library.TYPE_EXTENSION) {
+ LOGGER.warn("Ignoring library " + library + " which is of an unsupported type " + type + ".");
+ continue;
+ }
final String path;
switch (type) {
case Library.TYPE_ENDORSED: path = "lib/endorsed"; break;
http://git-wip-us.apache.org/repos/asf/karaf/blob/3f1f44b6/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper.conf
----------------------------------------------------------------------
diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper.conf b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper.conf
index 38c1afe..9bc2f9c 100644
--- a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper.conf
+++ b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper.conf
@@ -44,9 +44,7 @@ wrapper.java.additional.4=-Dkaraf.etc=%KARAF_ETC%
wrapper.java.additional.5=-Dcom.sun.management.jmxremote
wrapper.java.additional.6=-Dkaraf.startLocalConsole=false
wrapper.java.additional.7=-Dkaraf.startRemoteShell=true
-wrapper.java.additional.8=-Djava.endorsed.dirs=%JAVA_HOME%/jre/lib/endorsed:%JAVA_HOME%/lib/endorsed:%KARAF_HOME%/lib/endorsed
-wrapper.java.additional.9=-Djava.ext.dirs=%JAVA_HOME%/jre/lib/ext:%JAVA_HOME%/lib/ext:%KARAF_HOME%/lib/ext
-wrapper.java.additional.10=-Djava.io.tmpdir=%KARAF_DATA%/tmp
+wrapper.java.additional.8=-Djava.io.tmpdir=%KARAF_DATA%/tmp
# Uncomment to enable jmx
#wrapper.java.additional.n=-Dcom.sun.management.jmxremote.port=1616
http://git-wip-us.apache.org/repos/asf/karaf/blob/3f1f44b6/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper.conf
----------------------------------------------------------------------
diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper.conf b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper.conf
index 426761d..4765361 100644
--- a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper.conf
+++ b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper.conf
@@ -44,9 +44,7 @@ wrapper.java.additional.4=-Dkaraf.etc="%KARAF_ETC%"
wrapper.java.additional.5=-Dcom.sun.management.jmxremote
wrapper.java.additional.6=-Dkaraf.startLocalConsole=false
wrapper.java.additional.7=-Dkaraf.startRemoteShell=true
-wrapper.java.additional.8=-Djava.endorsed.dirs="%JAVA_HOME%/jre/lib/endorsed;%JAVA_HOME%/lib/endorsed;%KARAF_HOME%/lib/endorsed"
-wrapper.java.additional.9=-Djava.ext.dirs="%JAVA_HOME%/jre/lib/ext;%JAVA_HOME%/lib/ext;%KARAF_HOME%/lib/ext"
-wrapper.java.additional.10=-Djava.io.tmpdir="%KARAF_DATA%/tmp"
+wrapper.java.additional.8=-Djava.io.tmpdir="%KARAF_DATA%/tmp"
# Uncomment to enable jmx
#wrapper.java.additional.n=-Dcom.sun.management.jmxremote.port=1616
http://git-wip-us.apache.org/repos/asf/karaf/blob/3f1f44b6/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper.conf
----------------------------------------------------------------------
diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper.conf b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper.conf
index 426761d..4765361 100644
--- a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper.conf
+++ b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper.conf
@@ -44,9 +44,7 @@ wrapper.java.additional.4=-Dkaraf.etc="%KARAF_ETC%"
wrapper.java.additional.5=-Dcom.sun.management.jmxremote
wrapper.java.additional.6=-Dkaraf.startLocalConsole=false
wrapper.java.additional.7=-Dkaraf.startRemoteShell=true
-wrapper.java.additional.8=-Djava.endorsed.dirs="%JAVA_HOME%/jre/lib/endorsed;%JAVA_HOME%/lib/endorsed;%KARAF_HOME%/lib/endorsed"
-wrapper.java.additional.9=-Djava.ext.dirs="%JAVA_HOME%/jre/lib/ext;%JAVA_HOME%/lib/ext;%KARAF_HOME%/lib/ext"
-wrapper.java.additional.10=-Djava.io.tmpdir="%KARAF_DATA%/tmp"
+wrapper.java.additional.8=-Djava.io.tmpdir="%KARAF_DATA%/tmp"
# Uncomment to enable jmx
#wrapper.java.additional.n=-Dcom.sun.management.jmxremote.port=1616