changes for clean compile and tomcat successfully loading

OpenNTF · Aug 18, 2015 · 7d39dc5 · 7d39dc5
1 parent 9d400b9
commit 7d39dc5
Show file tree

Hide file tree

Showing 99 changed files with 532 additions and 448 deletions.
diff --git a/assembly/platform/tomcat/server.xml b/assembly/platform/tomcat/server.xml
@@ -19,7 +19,7 @@
      define subcomponents such as "Valves" at this level.
      Documentation at /docs/config/server.html
  -->
- <!-- File is not used by the Assembly Process --!>
+ <!-- File is not used by the Assembly Process -->
 <Server port="8005" shutdown="SHUTDOWN">
   <!-- Security listener. Documentation at /docs/config/listeners.html
   <Listener className="org.apache.catalina.security.SecurityListener" />

diff --git a/assembly/pom.xml b/assembly/pom.xml
@@ -16,7 +16,7 @@
 	<parent>
 		<groupId>com.ibm.sbt</groupId>
 		<artifactId>com.ibm.sbt</artifactId>
-		<version>1.1.6-SNAPSHOT</version>
+		<version>1.1.6.20150817-1200</version>
 	</parent>
 
 	<build>
@@ -320,28 +320,30 @@
 								<delete
 									dir="${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.61/webapps/ROOT" />
 
-
-
 								<copy
 									todir="${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.61/conf"
-									file="./../samples/config/sbt.properties" />
-
+									file="./../samples/config/sbt.properties"  overwrite="true" />
 
 								<copy
 									file="./../libraries/com.ibm.sbt.libs.java/lib/com.ibm.sbt.javamail-1.4.5.jar"
-									todir="${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.61/lib" />
+									todir="${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.61/lib"  overwrite="true"/>
 
+								<copy
+									file="./../assembly/platform/tomcat/keystore"
+									todir="${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.61/conf"  overwrite="true"/>
 
 								<copy
-									todir="${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.61/conf">
-									<fileset dir="platform/tomcat">
-										<include name="keystore" />
-										<include name="context.xml" />
-										<include name="tomcat-users.xml" />
-										<include name="server.xml" />
-									</fileset>
-								</copy>
+									file="./../assembly/platform/tomcat/context.xml"
+									todir="${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.61/conf"  overwrite="true"/>
 
+								<copy
+									file="./../assembly/platform/tomcat/tomcat-users.xml"
+									todir="${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.61/conf" overwrite="true" />
+
+								<copy
+									file="./../assembly/platform/tomcat/server.xml"
+									todir="${project.build.directory}/tomcat/unzip/apache-tomcat-7.0.61/conf" overwrite="true" />
+
 								<path id="source_folder_name">
 									<dirset dir="${project.build.directory}/sources/SocialSDK">
 										<include name="SocialSDK*" />
@@ -419,28 +421,28 @@
 			<groupId>com.ibm.sbt</groupId>
 			<artifactId>sbt.dojo180</artifactId>
 
-			<version>1.1.6-SNAPSHOT</version>
+			<version>1.1.6.20150817-1200</version>
 			<type>war</type>
 		</dependency>
 		<dependency>
 			<groupId>com.ibm.sbt</groupId>
 			<artifactId>sbt.jquery182</artifactId>
 
-			<version>1.1.6-SNAPSHOT</version>
+			<version>1.1.6.20150817-1200</version>
 			<type>war</type>
 		</dependency>
 		<dependency>
 			<groupId>com.ibm.sbt</groupId>
 			<artifactId>sbt.bootstrap211</artifactId>
 
-			<version>1.1.6-SNAPSHOT</version>
+			<version>1.1.6.20150817-1200</version>
 			<type>war</type>
 		</dependency>
 		<dependency>
 			<groupId>com.ibm.sbt</groupId>
 			<artifactId>sbt.sample.web</artifactId>
 
-			<version>1.1.6-SNAPSHOT</version>
+			<version>1.1.6.20150817-1200</version>
 			<type>war</type>
 		</dependency>
 
@@ -450,29 +452,29 @@
 			<groupId>com.ibm.sbt</groupId>
 			<artifactId>com.ibm.sbt.landing</artifactId>
 
-			<version>1.1.6-SNAPSHOT</version>
+			<version>1.1.6.20150817-1200</version>
 			<type>war</type>
 		</dependency>
 
 		<dependency>
 			<groupId>com.ibm.sbt</groupId>
 			<artifactId>acme.social.sample.dataapp</artifactId>
 
-			<version>1.1.6-SNAPSHOT</version>
+			<version>1.1.6.20150817-1200</version>
 			<type>war</type>
 		</dependency>
 		<dependency>
 			<groupId>com.ibm.sbt</groupId>
 			<artifactId>acme.social.sample.webapp</artifactId>
 
-			<version>1.1.6-SNAPSHOT</version>
+			<version>1.1.6.20150817-1200</version>
 			<type>war</type>
 		</dependency>
 		<dependency>
 			<groupId>com.ibm.sbt</groupId>
 			<artifactId>helloworld.webapp</artifactId>
 
-			<version>1.1.6-SNAPSHOT</version>
+			<version>1.1.6.20150817-1200</version>
 			<type>war</type>
 		</dependency>
 
@@ -485,21 +487,21 @@
 			<groupId>com.ibm.sbt</groupId>
 			<artifactId>smartcloud.webapp</artifactId>
 
-			<version>1.1.6-SNAPSHOT</version>
+			<version>1.1.6.20150817-1200</version>
 			<type>war</type>
 		</dependency>
 		<dependency>
 			<groupId>com.ibm.sbt</groupId>
 			<artifactId>grantaccess.webapp</artifactId>
 
-			<version>1.1.6-SNAPSHOT</version>
+			<version>1.1.6.20150817-1200</version>
 			<type>war</type>
 		</dependency>
 		<dependency>
 			<groupId>com.ibm.sbt</groupId>
 			<artifactId>acme.sample.webapp</artifactId>
 
-			<version>1.1.6-SNAPSHOT</version>
+			<version>1.1.6.20150817-1200</version>
 			<type>war</type>
 		</dependency>
 
@@ -512,50 +514,50 @@
 			<groupId>com.ibm.sbt</groupId>
 			<artifactId>com.ibm.sbt.web</artifactId>
 
-			<version>1.1.6-SNAPSHOT</version>
+			<version>1.1.6.20150817-1200</version>
 			<type>war</type>
 		</dependency>
 
 		<dependency>
 			<groupId>com.ibm.sbt</groupId>
 			<artifactId>com.ibm.commons</artifactId>
-			<version>9.0.0</version>
+			<version>1.1.6.20150817-1200</version>
 		</dependency>
 		<dependency>
 			<groupId>com.ibm.sbt</groupId>
 			<artifactId>com.ibm.commons.runtime</artifactId>
-			<version>1.1.6-SNAPSHOT</version>
+			<version>1.1.6.20150817-1200</version>
 		</dependency>
 		<dependency>
 			<groupId>com.ibm.sbt</groupId>
 			<artifactId>com.ibm.commons.xml</artifactId>
-			<version>9.0.0</version>
+			<version>1.1.6.20150817-1200</version>
 		</dependency>
 
 		<dependency>
 			<groupId>com.ibm.sbt</groupId>
 			<artifactId>bss.provisioning.sample.app</artifactId>
-			<version>1.1.6-SNAPSHOT</version>
+			<version>1.1.6.20150817-1200</version>
 
 		</dependency>
 
 
 		<dependency>
 			<groupId>com.ibm.sbt</groupId>
 			<artifactId>com.ibm.sbt.php.wordpress</artifactId>
-			<version>1.1.6-SNAPSHOT</version>
+			<version>1.1.6.20150817-1200</version>
 			<type>zip</type>
 		</dependency>
 		<dependency>
 			<groupId>com.ibm.sbt</groupId>
 			<artifactId>com.ibm.sbt.php.core</artifactId>
-			<version>1.1.6-SNAPSHOT</version>
+			<version>1.1.6.20150817-1200</version>
 			<type>zip</type>
 		</dependency>
 		<dependency>
 			<groupId>com.ibm.sbt</groupId>
 			<artifactId>com.ibm.sbt.php.moodle</artifactId>
-			<version>1.1.6-SNAPSHOT</version>
+			<version>1.1.6.20150817-1200</version>
 			<type>zip</type>
 		</dependency>
 	</dependencies>

diff --git a/commons/com.ibm.commons.runtime/META-INF/MANIFEST.MF b/commons/com.ibm.commons.runtime/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Common Runtime Classes
 Bundle-SymbolicName: com.ibm.commons.runtime
-Bundle-Version: 1.1.6.qualifier
+Bundle-Version: 1.1.6.20150817-1200
 Bundle-Vendor: IBM
 Export-Package: com.ibm.commons.runtime,com.ibm.commons.runtime.beans,
  com.ibm.commons.runtime.impl,com.ibm.commons.runtime.impl.app,com.ibm

diff --git a/commons/com.ibm.commons.runtime/pom.xml b/commons/com.ibm.commons.runtime/pom.xml
@@ -7,7 +7,9 @@
   <parent>
     <groupId>com.ibm.sbt</groupId>
     <artifactId>com.ibm.sbt.commons</artifactId>
-    <version>1.1.6-SNAPSHOT</version>
+    <version>1.1.6.20150817-1200</version>
   </parent>
+
+  <version>1.1.6.20150817-1200</version>
 
 </project>
diff --git a/commons/com.ibm.commons.xml/META-INF/MANIFEST.MF b/commons/com.ibm.commons.xml/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: XML utilities Plug-in
 Bundle-SymbolicName: com.ibm.commons.xml;singleton:=true
-Bundle-Version: 9.0.0
+Bundle-Version: 1.1.6.20150817-1200
 Bundle-Vendor: IBM
 Eclipse-LazyStart: true
 Require-Bundle: com.ibm.commons,

diff --git a/commons/com.ibm.commons.xml/pom.xml b/commons/com.ibm.commons.xml/pom.xml
@@ -7,10 +7,10 @@
 	<parent>
 		<groupId>com.ibm.sbt</groupId>
 		<artifactId>com.ibm.sbt.commons</artifactId>
-		<version>1.1.6-SNAPSHOT</version>
+		<version>1.1.6.20150817-1200</version>
 	</parent>
 
-	<version>9.0.0</version>
+	<version>1.1.6.20150817-1200</version>
 
 	<build>
 	<plugins>

diff --git a/commons/com.ibm.commons/META-INF/MANIFEST.MF b/commons/com.ibm.commons/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Commons Utilities
 Bundle-SymbolicName: com.ibm.commons;singleton:=true
-Bundle-Version: 9.0.0
+Bundle-Version: 1.1.6.20150817-1200
 Bundle-Localization: plugin
 Export-Package: com.ibm.commons,com.ibm.commons.extension,com.ibm.comm
  ons.log,com.ibm.commons.log.eclipse,com.ibm.commons.log.jdk,com.ibm.c

diff --git a/commons/com.ibm.commons/pom.xml b/commons/com.ibm.commons/pom.xml
@@ -7,8 +7,8 @@
   <parent>
   <groupId>com.ibm.sbt</groupId>
   <artifactId>com.ibm.sbt.commons</artifactId>
-  <version>1.1.6-SNAPSHOT</version>
+  <version>1.1.6.20150817-1200</version>
   </parent>
 
-  <version>9.0.0</version>
+  <version>1.1.6.20150817-1200</version>
 </project>
diff --git a/commons/pom.xml b/commons/pom.xml
@@ -4,10 +4,12 @@
 	<artifactId>com.ibm.sbt.commons</artifactId>
 	<packaging>pom</packaging>
 
+	<version>1.1.6.20150817-1200</version>
+
 	<parent>
 		<artifactId>com.ibm.sbt</artifactId>
 		<groupId>com.ibm.sbt</groupId>
-		<version>1.1.6-SNAPSHOT</version>
+		<version>1.1.6.20150817-1200</version>
 	</parent>
 	<modules>
 		<module>com.ibm.commons</module>

diff --git a/deps/com.ibm.sbt.bootstrap211/pom.xml b/deps/com.ibm.sbt.bootstrap211/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.ibm.sbt</groupId>
 		<artifactId>com.ibm.sbt.dependencies</artifactId>
-		<version>1.1.6-SNAPSHOT</version>
+		<version>1.1.6.20150817-1200</version>
 	</parent>
 
 </project>
diff --git a/deps/com.ibm.sbt.ckeditor422/pom.xml b/deps/com.ibm.sbt.ckeditor422/pom.xml
@@ -7,6 +7,6 @@
 	<parent>
 		<groupId>com.ibm.sbt</groupId>
 		<artifactId>com.ibm.sbt.dependencies</artifactId>
-		<version>1.1.6-SNAPSHOT</version>
+		<version>1.1.6.20150817-1200</version>
 	</parent>
 </project>
diff --git a/deps/com.ibm.sbt.dojo180/pom.xml b/deps/com.ibm.sbt.dojo180/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.ibm.sbt</groupId>
 		<artifactId>com.ibm.sbt.dependencies</artifactId>
-		<version>1.1.6-SNAPSHOT</version>
+		<version>1.1.6.20150817-1200</version>
 	</parent>
 
 

diff --git a/deps/com.ibm.sbt.jquery182/pom.xml b/deps/com.ibm.sbt.jquery182/pom.xml
@@ -7,6 +7,6 @@
 	<parent>
 		<groupId>com.ibm.sbt</groupId>
 		<artifactId>com.ibm.sbt.dependencies</artifactId>
-		<version>1.1.6-SNAPSHOT</version>
+		<version>1.1.6.20150817-1200</version>
 	</parent>
 </project>
diff --git a/deps/pom.xml b/deps/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<artifactId>com.ibm.sbt</artifactId>
 		<groupId>com.ibm.sbt</groupId>
-		<version>1.1.6-SNAPSHOT</version>
+		<version>1.1.6.20150817-1200</version>
 	</parent>
 	<modules>
 		<module>com.ibm.sbt.bootstrap211</module>

diff --git a/domino/com.ibm.sbt.domino.feature/feature.xml b/domino/com.ibm.sbt.domino.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.ibm.sbt.domino.feature"
       label="Domino SBT Feature"
-      version="1.1.6.qualifier"
+      version="1.1.6.20150817-1200"
       provider-name="IBM">
 
    <license url="http://www.apache.org/licenses/LICENSE-2.0">

diff --git a/domino/com.ibm.sbt.domino.feature/pom.xml b/domino/com.ibm.sbt.domino.feature/pom.xml
@@ -6,6 +6,6 @@
   <parent>
     <groupId>com.ibm.sbt</groupId>
     <artifactId>com.ibm.sbt.domino</artifactId>
-    <version>1.1.6-SNAPSHOT</version>
+    <version>1.1.6.20150817-1200</version>
   </parent>
 </project>
diff --git a/domino/com.ibm.sbt.domino.updatesite/pom.xml b/domino/com.ibm.sbt.domino.updatesite/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.ibm.sbt</groupId>
 		<artifactId>com.ibm.sbt.domino</artifactId>
-		<version>1.1.6-SNAPSHOT</version>
+		<version>1.1.6.20150817-1200</version>
 	</parent>
 
 	<build>

diff --git a/domino/com.ibm.sbt.domino.updatesite/site.xml b/domino/com.ibm.sbt.domino.updatesite/site.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/com.ibm.sbt.domino.feature_1.1.6.qualifier.jar" id="com.ibm.sbt.domino.feature" version="1.1.6.qualifier"/>
-   <feature url="features/com.ibm.sbt.opensocial.domino.feature_1.1.6.qualifier.jar" id="com.ibm.sbt.opensocial.domino.feature" version="1.1.6.qualifier"/>
-   <feature url="features/com.ibm.sbt.opensocial.domino.explorer.feature_1.1.6.qualifier.jar" id="com.ibm.sbt.opensocial.domino.explorer.feature" version="1.1.6.qualifier"/>
+   <feature url="features/com.ibm.sbt.domino.feature_1.1.6.20150817-1200.jar" id="com.ibm.sbt.domino.feature" version="1.1.6.20150817-1200"/>
+   <feature url="features/com.ibm.sbt.opensocial.domino.feature_1.1.6.20150817-1200.jar" id="com.ibm.sbt.opensocial.domino.feature" version="1.1.6.20150817-1200"/>
+   <feature url="features/com.ibm.sbt.opensocial.domino.explorer.feature_1.1.6.20150817-1200.jar" id="com.ibm.sbt.opensocial.domino.explorer.feature" version="1.1.6.20150817-1200"/>
 </site>
diff --git a/domino/com.ibm.sbt.opensocial.domino.explorer.feature/feature.xml b/domino/com.ibm.sbt.opensocial.domino.explorer.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="com.ibm.sbt.opensocial.domino.explorer.feature"
       label="OpenSocial Explorer Feature"
-      version="1.1.6.qualifier"
+      version="1.1.6.20150817-1200"
       provider-name="IBM">
 
    <license url="http://www.apache.org/licenses/LICENSE-2.0">

diff --git a/domino/com.ibm.sbt.opensocial.domino.explorer.feature/pom.xml b/domino/com.ibm.sbt.opensocial.domino.explorer.feature/pom.xml
@@ -6,6 +6,6 @@
   <parent>
     <groupId>com.ibm.sbt</groupId>
     <artifactId>com.ibm.sbt.domino</artifactId>
-    <version>1.1.6-SNAPSHOT</version>
+    <version>1.1.6.20150817-1200</version>
   </parent>
 </project>