Merge "Issue #450 - the pde build will now build a p2 repository for collaboration. Removed org.jivesoftware.smack from the collaboration feature because it is already in the cots feature which is included in the collaboration feature. Had to remove and re-add log4j to the alertviz and cots features." into 11-Collaboration

Former-commit-id: 354b3907fb [formerly 5d1892242a] [formerly 82783e27fd] [formerly 3baf9d03c2 [formerly 82783e27fd [formerly b1420977f92e3b5b206f33ce2e1275aee53cc2ae]]]
Former-commit-id: 3baf9d03c2
Former-commit-id: d378932ad42a50abccb7f393f0d20a538b2651f3 [formerly 61d0a876dd]
Former-commit-id: 929a056e1b

cave/build/p2-build.xml

@@ -274,6 +274,10 @@
 		     <param name="feature"
 		          value="com.raytheon.uf.viz.npp.feature" />
 		</antcall>
+		<antcall target="p2.build.repo">
+			<param name="feature"
+				  value="com.raytheon.uf.viz.collaboration.feature" />
+		</antcall>
 		
 		<antcall target="cleanup.features" />
 	</target>

cave/com.raytheon.uf.viz.collaboration.feature/feature.xml

@@ -87,13 +87,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.jivesoftware.smack"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="com.raytheon.uf.viz.collaboration.ui"
          download-size="0"

cave/com.raytheon.uf.viz.cots.feature/feature.xml

@@ -103,7 +103,7 @@
          install-size="0"
          version="0.0.0"
          fragment="true"/>
-         
+
    <plugin
          id="meteolib.jni.win32"
          os="win32"
@@ -215,12 +215,6 @@
          install-size="0"
          version="0.0.0"/>
 
-   <plugin
-         id="org.apache.log4j"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
    <plugin
          id="org.apache.mina"
          download-size="0"
@@ -286,7 +280,7 @@
          install-size="0"
          version="0.0.0"
          fragment="true"/>
-         
+
    <plugin
          id="org.jep.win32"
          os="win32"
@@ -296,12 +290,6 @@
          version="0.0.0"
          fragment="true"/>
 
-   <plugin
-         id="org.jivesoftware.smack"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
    <plugin
          id="org.junit"
          download-size="0"
@@ -363,4 +351,18 @@
          install-size="0"
          version="0.0.0"/>
 
+   <plugin
+         id="org.jivesoftware.smack"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.log4j"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>

cave/com.raytheon.uf.viz.feature.alertviz/feature.xml

@@ -228,12 +228,6 @@
          install-size="0"
          version="0.0.0"/>
 
-   <plugin
-         id="org.apache.log4j"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
    <plugin
          id="org.jep"
          download-size="0"
@@ -525,4 +519,11 @@
          install-size="0"
          version="0.0.0"/>
 
+   <plugin
+         id="org.apache.log4j"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>