[BACKLOG-7722] - Adding karaf to PME

pentaho · May 11, 2016 · 08f3036 · 08f3036
1 parent 960cb5a
commit 08f3036
Show file tree

Hide file tree

Showing 7 changed files with 152 additions and 3 deletions.
diff --git a/build.properties b/build.properties
@@ -6,14 +6,18 @@ ivy.artifact.group=pentaho
 project.revision=7.0-SNAPSHOT
 dependency.pentaho-connections.revision=7.0-SNAPSHOT
 dependency.kettle.revision=7.0-SNAPSHOT
+dependency.pdi-osgi-bridge.revision=7.0-SNAPSHOT
+dependency.pentaho-capability-manager.revision=7.0-SNAPSHOT
 dependency.pentaho-cwm.revision=1.5.4
 dependency.pentaho-metadata.revision=7.0-SNAPSHOT
 dependency.pentaho-mql-editor.revision=7.0-SNAPSHOT
+dependency.pentaho-platform.revision=7.0-SNAPSHOT
 #kettle requires us to remain at an old xul and database version
 dependency.pentaho-xul.revision=7.0-SNAPSHOT
 dependency.bi-platform.revision=7.0-SNAPSHOT
 dependency.pentaho-vfs-browser.revision=7.0-SNAPSHOT
 dependency.pdi-dataservice-plugin.revision=7.0-SNAPSHOT
+dependency.spring.security.revision=2.0.8.RELEASE
 
 dependency.reporting-library.revision=7.0-SNAPSHOT
 

diff --git a/build.xml b/build.xml
@@ -36,6 +36,11 @@
   			value="${package.basename}-sources.tar.gz"/>
   <property name="javadoc.packagenames"
 	        value="org.pentaho.*"/>
+  <property name="package.root.dir"
+            value="${ivy.artifact.id}"
+            description="Root directory of final zip or tar package" />
+  <!--<property name="system.dir" value="${stage.dir}/${package.root.dir}/system" />-->
+  <property name="system.dir" value="${stage.dir}/system" />
 
   <property name="package.resdir" value="${basedir}/package-res" />
 
@@ -149,7 +154,7 @@
     <ivy:retrieve conf="oss-licenses" pattern="${bin.dir}/[module].[ext]" />
   </target>
 
-  <target name="assemble" depends="-init-assemble,resolve-launcher,resolve-swtlibs,resolve-oss-licenses,jar,-stage-dist-lib,-stage-pentaho-libs,unzip-swtlibs" description="copy jar file to distribution directory">
+  <target name="assemble" depends="-init-assemble,resolve-launcher,resolve-swtlibs,resolve-oss-licenses,resolve-pentaho-system,jar,-stage-dist-lib,-stage-pentaho-libs,unzip-swtlibs" description="copy jar file to distribution directory">
     <copy todir="${stage.dir}">
       <fileset dir="." includes="releasenotes.txt" excludes="**/build, **/dist" />
     </copy>
@@ -378,4 +383,21 @@
       <ivy:resolve file="${ivyfile}" conf="launcher" />
       <ivy:retrieve conf="launcher" pattern="${stage.dir}/launcher/[module].[ext]" />
     </target>
+
+    <target name="resolve-pentaho-system" depends="install-ivy">
+      <ivy:resolve file="${ivyfile}" conf="pentaho-system" />
+      <ivy:retrieve conf="pentaho-system" pattern="${system.dir}/[module].[ext]" />
+      <for param="system">
+        <path id="system-list">
+          <fileset dir="${system.dir}">
+            <include name="*.zip"/>
+          </fileset>
+        </path>
+        <sequential>
+          <unzip src="@{system}" dest="${system.dir}" overwrite="true"/>
+          <delete file="@{system}"/>
+        </sequential>
+      </for>
+      <move file="${system.dir}/pentaho-karaf-assembly" tofile="${system.dir}/karaf" />
+    </target>
 </project>
diff --git a/ivy.xml b/ivy.xml
@@ -12,6 +12,7 @@
       <conf name="swtlibs"/>
       <conf name="launcher"/>
       <conf name="oss-licenses" />
+      <conf name="pentaho-system" />
     </configurations>
 
     <publications>
@@ -43,7 +44,7 @@
         <dependency org="pentaho"        name="pentaho-connections"      rev="${dependency.pentaho-connections.revision}" conf="default->default" changing="true" transitive="false"/>
         <dependency org="pentaho"        name="pentaho-metadata"         rev="${dependency.pentaho-metadata.revision}" conf="default->default" changing="true" transitive="false"/>
         <dependency org="pentaho"        name="pentaho-mql-editor"       rev="${dependency.pentaho-mql-editor.revision}" conf="default->default" changing="true" transitive="false"/>
-        <dependency org="pentaho-kettle" name="kettle-engine"            rev="${dependency.kettle.revision}" conf="default->default" changing="true" transitive="false" />
+        <dependency org="pentaho-kettle" name="kettle-engine"            rev="${dependency.kettle.revision}" conf="default->default" changing="true" transitive="true" />
         <dependency org="pentaho-kettle" name="kettle-core"              rev="${dependency.kettle.revision}" conf="default->default" changing="true" transitive="true" />
         <dependency org="pentaho-kettle" name="kettle5-log4j-plugin"     rev="${dependency.kettle.revision}" conf="default->default" changing="true" transitive="false" />
         <dependency org="pentaho-kettle" name="kettle-dbdialog"          rev="${dependency.kettle.revision}" conf="default->default" changing="true" transitive="false" />
@@ -103,6 +104,21 @@
          <dependency org="pentaho" name="pdi-spark-plugin" rev="${dependency.pdi-spark-plugin.revision}" conf="ee-plugin->default" changing="true" transitive="false">
              <artifact name="pdi-spark-plugin" type="zip" />
          </dependency>
+         <dependency org="pentaho" name="pentaho-karaf-assembly" rev="${project.revision}" changing="true" conf="pentaho-system->default" m:classifier="client">
+             <artifact name="pentaho-karaf-assembly" type="zip" m:classifier="client"/>
+         </dependency>
+         <dependency org="org.apache.karaf" name="org.apache.karaf.main" rev="3.0.3"  transitive="false"/>
+         <dependency org="org.apache.karaf" name="org.apache.karaf.util" rev="3.0.3"  transitive="false"/>
+         <dependency org="org.apache.karaf.jaas" name="org.apache.karaf.jaas.boot" rev="2.4.2"  transitive="false"/>
+         <dependency org="org.apache.felix" name="org.apache.felix.main" rev="4.2.1"  transitive="false"/>
+         <dependency org="com.tinkerpop.blueprints" name="blueprints-core"   rev="2.6.0"         transitive="false"/>
+         <dependency org="pentaho" name="pdi-osgi-bridge-core" rev="${dependency.pdi-osgi-bridge.revision}" changing="true" />
+         <dependency org="pentaho" name="pentaho-capability-manager"  rev="${dependency.pentaho-capability-manager.revision}" transitive="false"/>
+         <dependency org="pentaho" name="pentaho-metaverse-api" rev="${project.revision}" changing="true" transitive="false"/>
+         <dependency org="pentaho" name="pentaho-platform-api"  rev="${dependency.pentaho-platform.revision}" transitive="false"/>
+         <dependency org="pentaho" name="pentaho-platform-core"  rev="${dependency.pentaho-platform.revision}" transitive="false"/>
+         <dependency org="pentaho" name="pentaho-platform-extensions"  rev="${dependency.pentaho-platform.revision}" transitive="false"/>
+         <dependency org="org.springframework.security" name="spring-security-core" rev="${dependency.spring.security.revision}" />
 
         <!-- SWT it required to compile any version of any architecture will work -->
         <dependency org="org.eclipse.swt"       name="swt-linux-x86_64"    rev="4.3.2" transitive="false" />

diff --git a/package-res/classes/kettle-lifecycle-listeners.xml b/package-res/classes/kettle-lifecycle-listeners.xml
@@ -0,0 +1,11 @@
+<listeners>
+
+    <listener id="PdiOsgiBridge">
+        <description>PDI-OSGI-Bridge Listener</description>
+        <tooltip/>
+        <classname>org.pentaho.di.osgi.KettleLifeCycleAdapter</classname>
+        <meta-classname/>
+        <version-browser-classname/>
+    </listener>
+
+</listeners>
diff --git a/package-res/classes/kettle-registry-extensions.xml b/package-res/classes/kettle-registry-extensions.xml
@@ -0,0 +1,11 @@
+<registry-extensions>
+
+  <registry-extension id="PdiOsgiBridge">
+    <description>PDI-OSGI-Bridge Extension</description>
+    <tooltip/>
+    <classname>org.pentaho.di.osgi.registryExtension.OSGIPluginRegistryExtension</classname>
+    <meta-classname/>
+    <version-browser-classname/>
+  </registry-extension>
+
+</registry-extensions>
diff --git a/package-res/classes/log4j.xml b/package-res/classes/log4j.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!--
+   | For more configuration information and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+   <!-- ================================= -->
+   <!-- Preserve messages in a local file -->
+   <!-- ================================= -->
+
+   <!-- A time/date based rolling appender -->
+   <appender name="PENTAHOFILE" class="org.apache.log4j.DailyRollingFileAppender">
+
+      <param name="File" value="logs/pdi.log"/>
+      <param name="Append" value="false"/>
+
+      <!-- Rollover at midnight each day -->
+      <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+
+      <!-- Rollover at the top of each hour
+      <param name="DatePattern" value="'.'yyyy-MM-dd-HH"/>
+      -->
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Message\n -->
+         <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+
+         <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n
+         <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
+          -->
+      </layout>
+   </appender>
+
+   <!-- ============================== -->
+   <!-- Append messages to the console -->
+   <!-- ============================== -->
+
+   <appender name="PENTAHOCONSOLE" class="org.apache.log4j.ConsoleAppender">
+      <param name="Target" value="System.out"/>
+      <param name="Threshold" value="INFO"/>
+
+      <layout class="org.apache.log4j.PatternLayout">
+         <!-- The default pattern: Date Priority [Category] Message\n -->
+         <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+      </layout>
+   </appender>
+
+   <!-- ================ -->
+   <!-- Limit categories -->
+   <!-- ================ -->
+
+   <!--<category name="org.pentaho">-->
+     <!--<priority value="ERROR"/>-->
+   <!--</category>-->
+
+	<category name="org.pentaho.platform.osgi">
+		<priority value="INFO" />
+	</category>
+
+  <category name="org.pentaho.platform.engine.core.system.status">
+    <priority value="INFO"/>
+  </category>
+
+   <!-- ======================= -->
+   <!-- Setup the Root category -->
+   <!-- ======================= -->
+
+   <root>
+      <priority value="ERROR" />
+      <appender-ref ref="PENTAHOCONSOLE"/>
+      <!--<appender-ref ref="PENTAHOFILE"/>-->
+   </root>
+
+
+</log4j:configuration>
diff --git a/package-res/launcher/launcher.properties b/package-res/launcher/launcher.properties
@@ -1,3 +1,3 @@
 main=org.pentaho.pms.ui.MetaEditor
 libraries=../lib:../libext:../libext/commons:../libext/JDBC:../libext/meta:../libext/pentaho:../libext/misc:../libext/test:../libswt
-classpath=../:../ui:../ui/images
+classpath=../classes:../:../ui:../ui/images