Author: solomax Date: Wed Aug 3 16:31:17 2016 New Revision: 1755097 URL: http://svn.apache.org/viewvc?rev=1755097&view=rev Log: [OPENMEETINGS-1370] screen-sharing application can be successfully signed by Symantec signing server
Added:
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/assembly/
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/assembly/assembly.xml
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/assembly/
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/assembly/assembly.xml
openmeetings/application/trunk/openmeetings-screenshare/src/main/assembly/
openmeetings/application/trunk/openmeetings-screenshare/src/main/assembly/assembly.xml
Modified:
openmeetings/application/branches/3.1.x/openmeetings-screenshare/pom.xml
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp
openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/ReleaseGuide.xml
openmeetings/application/branches/3.1.x/pom.xml
openmeetings/application/branches/3.2.x/openmeetings-screenshare/pom.xml
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp
openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/ReleaseGuide.xml
openmeetings/application/branches/3.2.x/pom.xml
openmeetings/application/trunk/openmeetings-screenshare/pom.xml
openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
openmeetings/application/trunk/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/ReleaseGuide.xml
openmeetings/application/trunk/pom.xml
Modified:
openmeetings/application/branches/3.1.x/openmeetings-screenshare/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-screenshare/pom.xml?rev=1755097&r1=1755096&r2=1755097&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-screenshare/pom.xml
(original)
+++ openmeetings/application/branches/3.1.x/openmeetings-screenshare/pom.xml
Wed Aug 3 16:31:17 2016
@@ -37,6 +37,8 @@
<key.alias>screen</key.alias>
<site.basedir>${project.parent.basedir}</site.basedir>
<skip.site.copy>false</skip.site.copy>
+ <jnlp.out.dir>${project.build.directory}/jnlp</jnlp.out.dir>
+ <share.bcprov.version>1.52</share.bcprov.version>
</properties>
<dependencies>
<dependency>
@@ -52,257 +54,137 @@
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ <version>${share.bcprov.version}</version>
+ </dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestEntries>
-
<Permissions>all-permissions</Permissions>
-
<Trusted-Only>true"</Trusted-Only>
- <Codebase>*</Codebase>
-
<Crypto-Strength>unlimited</Crypto-Strength>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- <!-- plugin> FIXME review after
http://jira.codehaus.org/browse/MWEBSTART-266 is fixed
-
<groupId>com.google.code.maven-replacer-plugin</groupId>
- <artifactId>replacer</artifactId>
+ <artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
- <phase>process-resources</phase>
+ <id>create-template</id>
+
<phase>generate-resources</phase>
<goals>
- <goal>replace</goal>
+
<goal>copy-resources</goal>
</goals>
<configuration>
-
<file>${project.basedir}/src/main/jnlp/templates/template.jnlp</file>
-
<outputFile>${project.build.directory}/APPLICATION_TEMPLATE.jnlp</outputFile>
- <regex>false</regex>
- <replacements>
- <replacement>
-
<token>$applicationName</token>
-
<value>*</value>
- </replacement>
- <replacement>
-
<token>$codebase</token>
-
<value>*</value>
- </replacement>
- <replacement>
-
<token>$protocol</token>
-
<value>*</value>
- </replacement>
- <replacement>
-
<token>$host</token>
-
<value>*</value>
- </replacement>
- <replacement>
-
<token>$port</token>
-
<value>*</value>
- </replacement>
- <replacement>
-
<token>$app</token>
-
<value>*</value>
- </replacement>
- <replacement>
-
<token>$userId</token>
-
<value>*</value>
- </replacement>
- <replacement>
-
<token>$publicSid</token>
-
<value>*</value>
- </replacement>
- <replacement>
-
<token>$labels</token>
-
<value>*</value>
- </replacement>
- <replacement>
-
<token>$defaultQuality</token>
-
<value>*</value>
- </replacement>
- <replacement>
-
<token>$defaultFps</token>
-
<value>*</value>
- </replacement>
- <replacement>
-
<token>$showFps</token>
-
<value>*</value>
- </replacement>
- <replacement>
-
<token>$allowRemote</token>
-
<value>*</value>
- </replacement>
- <replacement>
-
<token>$allowRecording</token>
-
<value>*</value>
- </replacement>
- <replacement>
-
<token>$allowPublishing</token>
-
<value>*</value>
- </replacement>
- <replacement>
-
<token>$keystore</token>
-
<value>*</value>
- </replacement>
- <replacement>
-
<token>$password</token>
-
<value>*</value>
- </replacement>
- </replacements>
+
<outputDirectory>${project.build.directory}</outputDirectory>
+ <resources>
+ <resource>
+
<directory>${project.basedir}/src/main/jnlp/templates</directory>
+
<includes>
+
<include>*.jnlp</include>
+
</includes>
+
<filtering>true</filtering>
+ </resource>
+ </resources>
+
<skip>${skip.site.copy}</skip>
</configuration>
</execution>
</executions>
- </plugin-->
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
-
<id>copy-dependencies</id>
- <phase>package</phase>
- <goals>
-
<goal>copy-dependencies</goal>
- </goals>
- <configuration>
-
<outputDirectory>${project.build.directory}/lib</outputDirectory>
-
<overWriteReleases>false</overWriteReleases>
-
<overWriteSnapshots>false</overWriteSnapshots>
-
<overWriteIfNewer>true</overWriteIfNewer>
-
<excludeTransitive>true</excludeTransitive>
- </configuration>
- </execution>
- </executions>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+
<phase>generate-resources</phase>
+ <configuration>
+ <target>
+ <copy
file="${project.build.directory}/template.jnlp"
tofile="${jnlp.out.dir}/APPLICATION.jnlp" overwrite="true" force="true" />
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
- <artifactId>webstart-maven-plugin</artifactId>
+ <artifactId>keytool-maven-plugin</artifactId>
<executions>
- <!-- execution> FIXME review after
http://jira.codehaus.org/browse/MWEBSTART-266 is fixed
-
<id>generate-jnlp-template-for-signing</id>
- <phase>process-resources</phase>
- <goals>
- <goal>jnlp</goal>
- </goals>
+ <execution>
+
<goals><goal>generateKeyPair</goal></goals>
+
<phase>generate-resources</phase>
<configuration>
-
<excludeTransitive>false</excludeTransitive>
- <dependencies>
- <includes>
-
<include>commons-codec:commons-codec</include>
-
<include>commons-beanutils:commons-beanutils</include>
-
<include>commons-collections:commons-collections</include>
-
<include>org.apache.commons:commons-lang3</include>
-
<include>org.apache.httpcomponents:httpclient</include>
-
<include>org.apache.httpcomponents:httpcore</include>
-
<include>org.bouncycastle:bcprov-jdk15on</include>
-
<include>net.sf.ehcache:ehcache-core</include>
-
<include>org.slf4j:slf4j-api</include>
-
<include>org.slf4j:jcl-over-slf4j</include>
-
<include>ch.qos.logback:logback-core</include>
-
<include>ch.qos.logback:logback-classic</include>
-
<include>org.apache.mina:mina-core</include>
-
<include>org.red5:red5-io</include>
-
<include>org.red5:red5-server-common</include>
-
<include>org.red5:red5-client</include>
-
<include>org.springframework:spring-context</include>
-
<include>org.springframework:spring-core</include>
-
<include>org.springframework:spring-beans</include>
-
<include>org.quartz-scheduler:quartz</include>
- </includes>
- </dependencies>
- <jnlp>
-
<inputTemplateResourcePath>${project.build.directory}</inputTemplateResourcePath>
-
<inputTemplate>APPLICATION_TEMPLATE.jnlp</inputTemplate>
-
<outputFile>APPLICATION_TEMPLATE.jnlp</outputFile>
-
<mainClass>org.apache.openmeetings.screen.webstart.CoreScreenShare</mainClass>
- </jnlp>
-
<makeArchive>false</makeArchive>
+
<keystore>${keystore.location}</keystore>
+
<storepass>${keystore.password}</storepass>
+
<keypass>${key.password}</keypass>
+
<alias>${key.alias}</alias>
+ <dname>cn=Sebastian
Wagner, ou=technolog, o=openmeetings.apache.org, c=DE</dname>
+ <ext></ext>
+ <validity>365</validity>
+ <keyalg>RSA</keyalg>
+ <keysize>4096</keysize>
+
<storetype>${keystore.type}</storetype>
+
<skip>${jarsigner.skip}</skip>
</configuration>
- </execution-->
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
<execution>
-
<id>generate-jnlp-and-sign-libs</id>
+ <id>make-screen-sharing</id>
<phase>package</phase>
<goals>
- <goal>jnlp-inline</goal>
+ <goal>single</goal>
</goals>
<configuration>
-
<excludeTransitive>false</excludeTransitive>
- <dependencies>
- <includes>
-
<include>commons-codec:commons-codec</include>
-
<include>commons-beanutils:commons-beanutils</include>
-
<include>commons-collections:commons-collections</include>
-
<include>org.apache.commons:commons-lang3</include>
-
<include>org.apache.httpcomponents:httpclient</include>
-
<include>org.apache.httpcomponents:httpcore</include>
-
<include>org.bouncycastle:bcprov-jdk15on</include>
-
<include>net.sf.ehcache:ehcache-core</include>
-
<include>org.slf4j:slf4j-api</include>
-
<include>org.slf4j:jcl-over-slf4j</include>
-
<include>ch.qos.logback:logback-core</include>
-
<include>ch.qos.logback:logback-classic</include>
-
<include>org.apache.mina:mina-core</include>
-
<include>org.red5:red5-io</include>
-
<include>org.red5:red5-server-common</include>
-
<include>org.red5:red5-client</include>
-
<include>org.springframework:spring-context</include>
-
<include>org.springframework:spring-core</include>
-
<include>org.springframework:spring-beans</include>
-
<include>org.quartz-scheduler:quartz</include>
- </includes>
- </dependencies>
-
- <jnlp>
-
<inputTemplateResourcePath>${project.basedir}/src/main/jnlp/templates</inputTemplateResourcePath>
-
<inputTemplate>template.jnlp</inputTemplate>
-
<outputFile>APPLICATION.jnlp</outputFile>
-
<mainClass>org.apache.openmeetings.screen.webstart.CoreScreenShare</mainClass>
- </jnlp>
-
- <sign>
-
<keystore>${keystore.location}</keystore>
-
<keypass>${key.password}</keypass>
-
<storepass>${keystore.password}</storepass>
-
<storetype>${keystore.type}</storetype>
-
<alias>${key.alias}</alias>
-
-
<validity>365</validity>
-
<dnameCn>Sebastian Wagner</dnameCn>
-
<dnameOu>technology</dnameOu>
-
<dnameO>openmeetings.apache.org</dnameO>
- <!--
dnameL>Location</dnameL>
-
<dnameSt>State</dnameSt-->
-
<dnameC>DE</dnameC>
-
- <keystoreConfig>
-
<delete>false</delete>
-
<gen>true</gen>
-
</keystoreConfig>
-
<verify>false</verify> <!-- due to self signed certificate -->
- </sign>
- <unsign>false</unsign>
-
<outputJarVersions>false</outputJarVersions>
-
<makeArchive>false</makeArchive>
- <verbose>true</verbose>
+
<descriptor>src/main/assembly/assembly.xml</descriptor>
+
<outputDirectory>${jnlp.out.dir}</outputDirectory>
+ <archive>
+ <manifest>
+
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+
<mainClass>org.apache.openmeetings.screen.webstart.CoreScreenShare</mainClass>
+ </manifest>
+
<manifestEntries>
+
<Application-Name>${project.name}</Application-Name>
+
<Built-By>OpenMeetings - http://openmeetings.apache.org</Built-By>
+
<Built-On>${maven.build.timestamp}</Built-On>
+
<Svn-Revision>${buildNumber}</Svn-Revision>
+
<Product-Version>${project.version}</Product-Version>
+
<Permissions>all-permissions</Permissions>
+
<Trusted-Only>true</Trusted-Only>
+
<Codebase>*</Codebase>
+
<Crypto-Strength>unlimited</Crypto-Strength>
+
</manifestEntries>
+ </archive>
</configuration>
</execution>
</executions>
</plugin>
- <!-- plugin> FIXME review after
http://jira.codehaus.org/browse/MWEBSTART-266 is fixed
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>truezip-maven-plugin</artifactId>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
- <id>move-jnlp-template</id>
+ <id>copy-bcprov</id>
+ <phase>prepare-package</phase>
<goals>
- <goal>move</goal>
+ <goal>copy</goal>
</goals>
- <phase>verify</phase>
<configuration>
-
<from>${project.build.directory}/jnlp/APPLICATION_TEMPLATE.jnlp</from>
-
<to>${project.build.directory}/jnlp/${project.build.finalName}.jar/JNLP-INF/APPLICATION_TEMPLATE.jnlp</to>
+
<outputDirectory>${jnlp.out.dir}</outputDirectory>
+ <artifactItems>
+ <artifactItem>
+
<groupId>org.bouncycastle</groupId>
+
<artifactId>bcprov-jdk15on</artifactId>
+ </artifactItem>
+ </artifactItems>
+
<overWriteReleases>true</overWriteReleases>
+
<overWriteSnapshots>true</overWriteSnapshots>
+
<overWriteIfNewer>true</overWriteIfNewer>
+
<excludeTransitive>true</excludeTransitive>
</configuration>
</execution>
</executions>
@@ -312,27 +194,21 @@
<artifactId>maven-jarsigner-plugin</artifactId>
<executions>
<execution>
- <id>sign</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
+ <id>sign-applet</id>
+ <phase>package</phase>
+ <goals><goal>sign</goal></goals>
+ <configuration>
+
<archiveDirectory>${jnlp.out.dir}</archiveDirectory>
+
<keystore>${keystore.location}</keystore>
+
<keypass>${key.password}</keypass>
+
<storepass>${keystore.password}</storepass>
+
<storetype>${keystore.type}</storetype>
+
<alias>${key.alias}</alias>
+
<arguments><argument>-digestalg</argument><argument>SHA1</argument></arguments>
+ </configuration>
</execution>
</executions>
- <configuration>
-
<archiveDirectory>${project.build.directory}/jnlp</archiveDirectory>
- <includes>
-
<include>${project.build.finalName}.jar</include>
- </includes>
-
<keystore>${keystore.location}</keystore>
- <keypass>${key.password}</keypass>
-
<storepass>${keystore.password}</storepass>
- <storetype>${keystore.type}</storetype>
- <alias>${key.alias}</alias>
-
<removeExistingSignatures>true</removeExistingSignatures>
- <verbose>true</verbose>
- </configuration>
- </plugin-->
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
@@ -359,11 +235,11 @@
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
-
<groupId>org.codehaus.mojo</groupId>
-
<artifactId>webstart-maven-plugin</artifactId>
-
<versionRange>[1.0-beta-6,)</versionRange>
+
<groupId>com.google.code.maven-replacer-plugin</groupId>
+
<artifactId>replacer</artifactId>
+
<versionRange>[1.5.3,)</versionRange>
<goals>
-
<goal>jnlp</goal>
+
<goal>replace</goal>
</goals>
</pluginExecutionFilter>
<action>
@@ -372,11 +248,36 @@
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
-
<groupId>com.google.code.maven-replacer-plugin</groupId>
-
<artifactId>replacer</artifactId>
-
<versionRange>[1.5.3,)</versionRange>
+
<groupId>
+
org.apache.maven.plugins
+
</groupId>
+
<artifactId>
+
maven-antrun-plugin
+
</artifactId>
+
<versionRange>
+
[1.8,)
+
</versionRange>
<goals>
-
<goal>replace</goal>
+
<goal>run</goal>
+
</goals>
+
</pluginExecutionFilter>
+ <action>
+
<ignore></ignore>
+
</action>
+
</pluginExecution>
+
<pluginExecution>
+
<pluginExecutionFilter>
+
<groupId>
+
org.codehaus.mojo
+
</groupId>
+
<artifactId>
+
keytool-maven-plugin
+
</artifactId>
+
<versionRange>
+
[1.5,)
+
</versionRange>
+
<goals>
+
<goal>generateKeyPair</goal>
</goals>
</pluginExecutionFilter>
<action>
Added:
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/assembly/assembly.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/assembly/assembly.xml?rev=1755097&view=auto
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/assembly/assembly.xml
(added)
+++
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/assembly/assembly.xml
Wed Aug 3 16:31:17 2016
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<assembly>
+ <id>full</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>commons-codec:commons-codec</include>
+
<include>commons-beanutils:commons-beanutils</include>
+
<include>commons-collections:commons-collections</include>
+
<include>org.apache.commons:commons-lang3</include>
+
<include>org.apache.httpcomponents:httpclient</include>
+
<include>org.apache.httpcomponents:httpcore</include>
+
<include>org.bouncycastle:bcprov-jdk15on</include>
+ <include>net.sf.ehcache:ehcache-core</include>
+ <include>org.slf4j:slf4j-api</include>
+ <include>org.slf4j:jcl-over-slf4j</include>
+ <include>ch.qos.logback:logback-core</include>
+
<include>ch.qos.logback:logback-classic</include>
+ <include>org.apache.mina:mina-core</include>
+ <include>org.red5:red5-io</include>
+ <include>org.red5:red5-server-common</include>
+ <include>org.red5:red5-client</include>
+
<include>org.springframework:spring-context</include>
+
<include>org.springframework:spring-core</include>
+
<include>org.springframework:spring-beans</include>
+ <include>org.quartz-scheduler:quartz</include>
+ </includes>
+ <unpack>true</unpack>
+ <scope>runtime</scope>
+ <useProjectArtifact>true</useProjectArtifact>
+ </dependencySet>
+ </dependencySets>
+ <fileSets>
+ <fileSet>
+ <directory>${project.build.outputDirectory}</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java?rev=1755097&r1=1755096&r2=1755097&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
Wed Aug 3 16:31:17 2016
@@ -173,7 +173,7 @@ public class CoreScreenShare implements
public static void main(String[] args) {
new CoreScreenShare(args);
}
-
+
//
------------------------------------------------------------------------
//
// GUI
Modified:
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp?rev=1755097&r1=1755096&r2=1755097&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp
Wed Aug 3 16:31:17 2016
@@ -19,13 +19,13 @@
-->
<jnlp spec="6.0+" codebase="$codebase">
<information>
- <title>$informationTitle</title>
+ <title>${project.name}</title>
<vendor>$applicationName</vendor>
- <homepage>$informationHomepage</homepage>
+ <homepage>${project.organization.url}</homepage>
<icon href="icon.png" />
<icon kind="splash" href="splashicon.png" />
- <description>$informationTitle</description>
- <description kind="short">$informationDescription</description>
+ <description>${project.description}</description>
+ <description kind="short">${project.description}</description>
<offline-allowed/>
</information>
<security>
@@ -33,9 +33,10 @@
</security>
<resources>
<j2se version='1.7+'/>
- $dependencies
+ <jar href="bcprov-jdk15on-${share.bcprov.version}.jar"
main="true"/>
+ <jar
href="openmeetings-screenshare-${project.version}-full.jar" main="true"/>
</resources>
- <application-desc main-class='$mainClass'>
+ <application-desc
main-class='org.apache.openmeetings.screen.webstart.CoreScreenShare'>
<argument>$url</argument>
<argument>$publicSid</argument>
<argument>$labels</argument>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/ReleaseGuide.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/ReleaseGuide.xml?rev=1755097&r1=1755096&r2=1755097&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/ReleaseGuide.xml
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-server/src/site/xdoc/ReleaseGuide.xml
Wed Aug 3 16:31:17 2016
@@ -194,10 +194,8 @@ mkdir apache-openmeetings
cd apache-openmeetings
tar -xzf ../apache-openmeetings-$BRANCHORTAG.tar.gz
cd webapps/openmeetings/screenshare/
-mvn org.codehaus.mojo:webstart-maven-plugin:1.0-beta-8-SNAPSHOT:unsign
-Dmaven.jar.unsign.jarpath=.
</source>
</li>
- <li>Check any jar in
<tt>webapps/openmeetings/screenshare/</tt>: Its META-INF/MANIFEST.MF file
should NOT contain <tt>SHA1-Digest</tt> entries for classes</li>
<li>Go to <a
href="https://securesigning.websecurity.symantec.com/csportal/";>https://securesigning.websecurity.symantec.com/csportal/</a></li>
<li>Select "Signing Sets"</li>
<li>Select "Add signing set"</li>
Modified: openmeetings/application/branches/3.1.x/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/pom.xml?rev=1755097&r1=1755096&r2=1755097&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/pom.xml (original)
+++ openmeetings/application/branches/3.1.x/pom.xml Wed Aug 3 16:31:17 2016
@@ -109,11 +109,15 @@
</profile>
<profile>
<id>release</id>
+ <properties>
+ <jarsigner.skip>true</jarsigner.skip>
+ </properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.4.1</version>
<executions>
<execution>
<id>enforce-versions</id>
@@ -134,6 +138,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
+ <version>3.0.1</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -764,7 +769,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>3.0.0</version>
+ <version>3.0.2</version>
<configuration>
<archive>
<manifest>
@@ -826,16 +831,11 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>3.0.1</version>
+ <version>3.2.0</version>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
-
<artifactId>webstart-maven-plugin</artifactId>
- <version>1.0-beta-7</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
<artifactId>wagon-maven-plugin</artifactId>
<version>1.0</version>
</plugin>
@@ -909,7 +909,17 @@
</licenseFamilies>
</configuration>
</plugin>
-
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+
<artifactId>keytool-maven-plugin</artifactId>
+ <version>1.5</version>
+ </plugin>
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-jarsigner-plugin</artifactId>
+ <version>1.4</version>
+ </plugin>
+
<!--This plugin's configuration is used to
store Eclipse m2e settings only. It has no influence on the Maven build
itself.-->
<plugin>
<groupId>org.eclipse.m2e</groupId>
Modified:
openmeetings/application/branches/3.2.x/openmeetings-screenshare/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-screenshare/pom.xml?rev=1755097&r1=1755096&r2=1755097&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-screenshare/pom.xml
(original)
+++ openmeetings/application/branches/3.2.x/openmeetings-screenshare/pom.xml
Wed Aug 3 16:31:17 2016
@@ -37,6 +37,8 @@
<key.alias>screen</key.alias>
<site.basedir>${project.parent.basedir}</site.basedir>
<skip.site.copy>false</skip.site.copy>
+ <jnlp.out.dir>${project.build.directory}/jnlp</jnlp.out.dir>
+ <share.bcprov.version>1.52</share.bcprov.version>
</properties>
<dependencies>
<dependency>
@@ -52,257 +54,137 @@
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ <version>${share.bcprov.version}</version>
+ </dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestEntries>
-
<Permissions>all-permissions</Permissions>
-
<Trusted-Only>true"</Trusted-Only>
- <Codebase>*</Codebase>
-
<Crypto-Strength>unlimited</Crypto-Strength>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- <!-- plugin> FIXME review after
http://jira.codehaus.org/browse/MWEBSTART-266 is fixed
-
<groupId>com.google.code.maven-replacer-plugin</groupId>
- <artifactId>replacer</artifactId>
+ <artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
- <phase>process-resources</phase>
+ <id>create-template</id>
+
<phase>generate-resources</phase>
<goals>
- <goal>replace</goal>
+
<goal>copy-resources</goal>
</goals>
<configuration>
-
<file>${project.basedir}/src/main/jnlp/templates/template.jnlp</file>
-
<outputFile>${project.build.directory}/APPLICATION_TEMPLATE.jnlp</outputFile>
- <regex>false</regex>
- <replacements>
- <replacement>
-
<token>$applicationName</token>
-
<value>*</value>
- </replacement>
- <replacement>
-
<token>$codebase</token>
-
<value>*</value>
- </replacement>
- <replacement>
-
<token>$protocol</token>
-
<value>*</value>
- </replacement>
- <replacement>
-
<token>$host</token>
-
<value>*</value>
- </replacement>
- <replacement>
-
<token>$port</token>
-
<value>*</value>
- </replacement>
- <replacement>
-
<token>$app</token>
-
<value>*</value>
- </replacement>
- <replacement>
-
<token>$userId</token>
-
<value>*</value>
- </replacement>
- <replacement>
-
<token>$publicSid</token>
-
<value>*</value>
- </replacement>
- <replacement>
-
<token>$labels</token>
-
<value>*</value>
- </replacement>
- <replacement>
-
<token>$defaultQuality</token>
-
<value>*</value>
- </replacement>
- <replacement>
-
<token>$defaultFps</token>
-
<value>*</value>
- </replacement>
- <replacement>
-
<token>$showFps</token>
-
<value>*</value>
- </replacement>
- <replacement>
-
<token>$allowRemote</token>
-
<value>*</value>
- </replacement>
- <replacement>
-
<token>$allowRecording</token>
-
<value>*</value>
- </replacement>
- <replacement>
-
<token>$allowPublishing</token>
-
<value>*</value>
- </replacement>
- <replacement>
-
<token>$keystore</token>
-
<value>*</value>
- </replacement>
- <replacement>
-
<token>$password</token>
-
<value>*</value>
- </replacement>
- </replacements>
+
<outputDirectory>${project.build.directory}</outputDirectory>
+ <resources>
+ <resource>
+
<directory>${project.basedir}/src/main/jnlp/templates</directory>
+
<includes>
+
<include>*.jnlp</include>
+
</includes>
+
<filtering>true</filtering>
+ </resource>
+ </resources>
+
<skip>${skip.site.copy}</skip>
</configuration>
</execution>
</executions>
- </plugin-->
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
-
<id>copy-dependencies</id>
- <phase>package</phase>
- <goals>
-
<goal>copy-dependencies</goal>
- </goals>
- <configuration>
-
<outputDirectory>${project.build.directory}/lib</outputDirectory>
-
<overWriteReleases>false</overWriteReleases>
-
<overWriteSnapshots>false</overWriteSnapshots>
-
<overWriteIfNewer>true</overWriteIfNewer>
-
<excludeTransitive>true</excludeTransitive>
- </configuration>
- </execution>
- </executions>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+
<phase>generate-resources</phase>
+ <configuration>
+ <target>
+ <copy
file="${project.build.directory}/template.jnlp"
tofile="${jnlp.out.dir}/APPLICATION.jnlp" overwrite="true" force="true" />
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
- <artifactId>webstart-maven-plugin</artifactId>
+ <artifactId>keytool-maven-plugin</artifactId>
<executions>
- <!-- execution> FIXME review after
http://jira.codehaus.org/browse/MWEBSTART-266 is fixed
-
<id>generate-jnlp-template-for-signing</id>
- <phase>process-resources</phase>
- <goals>
- <goal>jnlp</goal>
- </goals>
+ <execution>
+
<goals><goal>generateKeyPair</goal></goals>
+
<phase>generate-resources</phase>
<configuration>
-
<excludeTransitive>false</excludeTransitive>
- <dependencies>
- <includes>
-
<include>commons-codec:commons-codec</include>
-
<include>commons-beanutils:commons-beanutils</include>
-
<include>commons-collections:commons-collections</include>
-
<include>org.apache.commons:commons-lang3</include>
-
<include>org.apache.httpcomponents:httpclient</include>
-
<include>org.apache.httpcomponents:httpcore</include>
-
<include>org.bouncycastle:bcprov-jdk15on</include>
-
<include>net.sf.ehcache:ehcache-core</include>
-
<include>org.slf4j:slf4j-api</include>
-
<include>org.slf4j:jcl-over-slf4j</include>
-
<include>ch.qos.logback:logback-core</include>
-
<include>ch.qos.logback:logback-classic</include>
-
<include>org.apache.mina:mina-core</include>
-
<include>org.red5:red5-io</include>
-
<include>org.red5:red5-server-common</include>
-
<include>org.red5:red5-client</include>
-
<include>org.springframework:spring-context</include>
-
<include>org.springframework:spring-core</include>
-
<include>org.springframework:spring-beans</include>
-
<include>org.quartz-scheduler:quartz</include>
- </includes>
- </dependencies>
- <jnlp>
-
<inputTemplateResourcePath>${project.build.directory}</inputTemplateResourcePath>
-
<inputTemplate>APPLICATION_TEMPLATE.jnlp</inputTemplate>
-
<outputFile>APPLICATION_TEMPLATE.jnlp</outputFile>
-
<mainClass>org.apache.openmeetings.screen.webstart.CoreScreenShare</mainClass>
- </jnlp>
-
<makeArchive>false</makeArchive>
+
<keystore>${keystore.location}</keystore>
+
<storepass>${keystore.password}</storepass>
+
<keypass>${key.password}</keypass>
+
<alias>${key.alias}</alias>
+ <dname>cn=Sebastian
Wagner, ou=technolog, o=openmeetings.apache.org, c=DE</dname>
+ <ext></ext>
+ <validity>365</validity>
+ <keyalg>RSA</keyalg>
+ <keysize>4096</keysize>
+
<storetype>${keystore.type}</storetype>
+
<skip>${jarsigner.skip}</skip>
</configuration>
- </execution-->
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
<execution>
-
<id>generate-jnlp-and-sign-libs</id>
+ <id>make-screen-sharing</id>
<phase>package</phase>
<goals>
- <goal>jnlp-inline</goal>
+ <goal>single</goal>
</goals>
<configuration>
-
<excludeTransitive>false</excludeTransitive>
- <dependencies>
- <includes>
-
<include>commons-codec:commons-codec</include>
-
<include>commons-beanutils:commons-beanutils</include>
-
<include>commons-collections:commons-collections</include>
-
<include>org.apache.commons:commons-lang3</include>
-
<include>org.apache.httpcomponents:httpclient</include>
-
<include>org.apache.httpcomponents:httpcore</include>
-
<include>org.bouncycastle:bcprov-jdk15on</include>
-
<include>net.sf.ehcache:ehcache-core</include>
-
<include>org.slf4j:slf4j-api</include>
-
<include>org.slf4j:jcl-over-slf4j</include>
-
<include>ch.qos.logback:logback-core</include>
-
<include>ch.qos.logback:logback-classic</include>
-
<include>org.apache.mina:mina-core</include>
-
<include>org.red5:red5-io</include>
-
<include>org.red5:red5-server-common</include>
-
<include>org.red5:red5-client</include>
-
<include>org.springframework:spring-context</include>
-
<include>org.springframework:spring-core</include>
-
<include>org.springframework:spring-beans</include>
-
<include>org.quartz-scheduler:quartz</include>
- </includes>
- </dependencies>
-
- <jnlp>
-
<inputTemplateResourcePath>${project.basedir}/src/main/jnlp/templates</inputTemplateResourcePath>
-
<inputTemplate>template.jnlp</inputTemplate>
-
<outputFile>APPLICATION.jnlp</outputFile>
-
<mainClass>org.apache.openmeetings.screen.webstart.CoreScreenShare</mainClass>
- </jnlp>
-
- <sign>
-
<keystore>${keystore.location}</keystore>
-
<keypass>${key.password}</keypass>
-
<storepass>${keystore.password}</storepass>
-
<storetype>${keystore.type}</storetype>
-
<alias>${key.alias}</alias>
-
-
<validity>365</validity>
-
<dnameCn>Sebastian Wagner</dnameCn>
-
<dnameOu>technology</dnameOu>
-
<dnameO>openmeetings.apache.org</dnameO>
- <!--
dnameL>Location</dnameL>
-
<dnameSt>State</dnameSt-->
-
<dnameC>DE</dnameC>
-
- <keystoreConfig>
-
<delete>false</delete>
-
<gen>true</gen>
-
</keystoreConfig>
-
<verify>false</verify> <!-- due to self signed certificate -->
- </sign>
- <unsign>false</unsign>
-
<outputJarVersions>false</outputJarVersions>
-
<makeArchive>false</makeArchive>
- <verbose>true</verbose>
+
<descriptor>src/main/assembly/assembly.xml</descriptor>
+
<outputDirectory>${jnlp.out.dir}</outputDirectory>
+ <archive>
+ <manifest>
+
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+
<mainClass>org.apache.openmeetings.screen.webstart.CoreScreenShare</mainClass>
+ </manifest>
+
<manifestEntries>
+
<Application-Name>${project.name}</Application-Name>
+
<Built-By>OpenMeetings - http://openmeetings.apache.org</Built-By>
+
<Built-On>${maven.build.timestamp}</Built-On>
+
<Svn-Revision>${buildNumber}</Svn-Revision>
+
<Product-Version>${project.version}</Product-Version>
+
<Permissions>all-permissions</Permissions>
+
<Trusted-Only>true</Trusted-Only>
+
<Codebase>*</Codebase>
+
<Crypto-Strength>unlimited</Crypto-Strength>
+
</manifestEntries>
+ </archive>
</configuration>
</execution>
</executions>
</plugin>
- <!-- plugin> FIXME review after
http://jira.codehaus.org/browse/MWEBSTART-266 is fixed
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>truezip-maven-plugin</artifactId>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
- <id>move-jnlp-template</id>
+ <id>copy-bcprov</id>
+ <phase>prepare-package</phase>
<goals>
- <goal>move</goal>
+ <goal>copy</goal>
</goals>
- <phase>verify</phase>
<configuration>
-
<from>${project.build.directory}/jnlp/APPLICATION_TEMPLATE.jnlp</from>
-
<to>${project.build.directory}/jnlp/${project.build.finalName}.jar/JNLP-INF/APPLICATION_TEMPLATE.jnlp</to>
+
<outputDirectory>${jnlp.out.dir}</outputDirectory>
+ <artifactItems>
+ <artifactItem>
+
<groupId>org.bouncycastle</groupId>
+
<artifactId>bcprov-jdk15on</artifactId>
+ </artifactItem>
+ </artifactItems>
+
<overWriteReleases>true</overWriteReleases>
+
<overWriteSnapshots>true</overWriteSnapshots>
+
<overWriteIfNewer>true</overWriteIfNewer>
+
<excludeTransitive>true</excludeTransitive>
</configuration>
</execution>
</executions>
@@ -312,27 +194,21 @@
<artifactId>maven-jarsigner-plugin</artifactId>
<executions>
<execution>
- <id>sign</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
+ <id>sign-applet</id>
+ <phase>package</phase>
+ <goals><goal>sign</goal></goals>
+ <configuration>
+
<archiveDirectory>${jnlp.out.dir}</archiveDirectory>
+
<keystore>${keystore.location}</keystore>
+
<keypass>${key.password}</keypass>
+
<storepass>${keystore.password}</storepass>
+
<storetype>${keystore.type}</storetype>
+
<alias>${key.alias}</alias>
+
<arguments><argument>-digestalg</argument><argument>SHA1</argument></arguments>
+ </configuration>
</execution>
</executions>
- <configuration>
-
<archiveDirectory>${project.build.directory}/jnlp</archiveDirectory>
- <includes>
-
<include>${project.build.finalName}.jar</include>
- </includes>
-
<keystore>${keystore.location}</keystore>
- <keypass>${key.password}</keypass>
-
<storepass>${keystore.password}</storepass>
- <storetype>${keystore.type}</storetype>
- <alias>${key.alias}</alias>
-
<removeExistingSignatures>true</removeExistingSignatures>
- <verbose>true</verbose>
- </configuration>
- </plugin-->
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
@@ -359,11 +235,11 @@
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
-
<groupId>org.codehaus.mojo</groupId>
-
<artifactId>webstart-maven-plugin</artifactId>
-
<versionRange>[1.0-beta-6,)</versionRange>
+
<groupId>com.google.code.maven-replacer-plugin</groupId>
+
<artifactId>replacer</artifactId>
+
<versionRange>[1.5.3,)</versionRange>
<goals>
-
<goal>jnlp</goal>
+
<goal>replace</goal>
</goals>
</pluginExecutionFilter>
<action>
@@ -372,11 +248,36 @@
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
-
<groupId>com.google.code.maven-replacer-plugin</groupId>
-
<artifactId>replacer</artifactId>
-
<versionRange>[1.5.3,)</versionRange>
+
<groupId>
+
org.apache.maven.plugins
+
</groupId>
+
<artifactId>
+
maven-antrun-plugin
+
</artifactId>
+
<versionRange>
+
[1.8,)
+
</versionRange>
<goals>
-
<goal>replace</goal>
+
<goal>run</goal>
+
</goals>
+
</pluginExecutionFilter>
+ <action>
+
<ignore></ignore>
+
</action>
+
</pluginExecution>
+
<pluginExecution>
+
<pluginExecutionFilter>
+
<groupId>
+
org.codehaus.mojo
+
</groupId>
+
<artifactId>
+
keytool-maven-plugin
+
</artifactId>
+
<versionRange>
+
[1.5,)
+
</versionRange>
+
<goals>
+
<goal>generateKeyPair</goal>
</goals>
</pluginExecutionFilter>
<action>
Added:
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/assembly/assembly.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/assembly/assembly.xml?rev=1755097&view=auto
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/assembly/assembly.xml
(added)
+++
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/assembly/assembly.xml
Wed Aug 3 16:31:17 2016
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<assembly>
+ <id>full</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>commons-codec:commons-codec</include>
+
<include>commons-beanutils:commons-beanutils</include>
+
<include>commons-collections:commons-collections</include>
+
<include>org.apache.commons:commons-lang3</include>
+
<include>org.apache.httpcomponents:httpclient</include>
+
<include>org.apache.httpcomponents:httpcore</include>
+
<include>org.bouncycastle:bcprov-jdk15on</include>
+ <include>net.sf.ehcache:ehcache-core</include>
+ <include>org.slf4j:slf4j-api</include>
+ <include>org.slf4j:jcl-over-slf4j</include>
+ <include>ch.qos.logback:logback-core</include>
+
<include>ch.qos.logback:logback-classic</include>
+ <include>org.apache.mina:mina-core</include>
+ <include>org.red5:red5-io</include>
+ <include>org.red5:red5-server-common</include>
+ <include>org.red5:red5-client</include>
+
<include>org.springframework:spring-context</include>
+
<include>org.springframework:spring-core</include>
+
<include>org.springframework:spring-beans</include>
+ <include>org.quartz-scheduler:quartz</include>
+ </includes>
+ <unpack>true</unpack>
+ <scope>runtime</scope>
+ <useProjectArtifact>true</useProjectArtifact>
+ </dependencySet>
+ </dependencySets>
+ <fileSets>
+ <fileSet>
+ <directory>${project.build.outputDirectory}</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
Modified:
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java?rev=1755097&r1=1755096&r2=1755097&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
Wed Aug 3 16:31:17 2016
@@ -173,7 +173,7 @@ public class CoreScreenShare implements
public static void main(String[] args) {
new CoreScreenShare(args);
}
-
+
//
------------------------------------------------------------------------
//
// GUI
Modified:
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp?rev=1755097&r1=1755096&r2=1755097&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp
Wed Aug 3 16:31:17 2016
@@ -19,13 +19,13 @@
-->
<jnlp spec="6.0+" codebase="$codebase">
<information>
- <title>$informationTitle</title>
+ <title>${project.name}</title>
<vendor>$applicationName</vendor>
- <homepage>$informationHomepage</homepage>
+ <homepage>${project.organization.url}</homepage>
<icon href="icon.png" />
<icon kind="splash" href="splashicon.png" />
- <description>$informationTitle</description>
- <description kind="short">$informationDescription</description>
+ <description>${project.description}</description>
+ <description kind="short">${project.description}</description>
<offline-allowed/>
</information>
<security>
@@ -33,9 +33,10 @@
</security>
<resources>
<j2se version='1.7+'/>
- $dependencies
+ <jar href="bcprov-jdk15on-${share.bcprov.version}.jar"
main="true"/>
+ <jar
href="openmeetings-screenshare-${project.version}-full.jar" main="true"/>
</resources>
- <application-desc main-class='$mainClass'>
+ <application-desc
main-class='org.apache.openmeetings.screen.webstart.CoreScreenShare'>
<argument>$url</argument>
<argument>$publicSid</argument>
<argument>$labels</argument>
Modified:
openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/ReleaseGuide.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/ReleaseGuide.xml?rev=1755097&r1=1755096&r2=1755097&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/ReleaseGuide.xml
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-server/src/site/xdoc/ReleaseGuide.xml
Wed Aug 3 16:31:17 2016
@@ -194,10 +194,8 @@ mkdir apache-openmeetings
cd apache-openmeetings
tar -xzf ../apache-openmeetings-$BRANCHORTAG.tar.gz
cd webapps/openmeetings/screenshare/
-mvn org.codehaus.mojo:webstart-maven-plugin:1.0-beta-8-SNAPSHOT:unsign
-Dmaven.jar.unsign.jarpath=.
</source>
</li>
- <li>Check any jar in
<tt>webapps/openmeetings/screenshare/</tt>: Its META-INF/MANIFEST.MF file
should NOT contain <tt>SHA1-Digest</tt> entries for classes</li>
<li>Go to <a
href="https://securesigning.websecurity.symantec.com/csportal/";>https://securesigning.websecurity.symantec.com/csportal/</a></li>
<li>Select "Signing Sets"</li>
<li>Select "Add signing set"</li>
Modified: openmeetings/application/branches/3.2.x/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/pom.xml?rev=1755097&r1=1755096&r2=1755097&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/pom.xml (original)
+++ openmeetings/application/branches/3.2.x/pom.xml Wed Aug 3 16:31:17 2016
@@ -109,11 +109,15 @@
</profile>
<profile>
<id>release</id>
+ <properties>
+ <jarsigner.skip>true</jarsigner.skip>
+ </properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.4.1</version>
<executions>
<execution>
<id>enforce-versions</id>
@@ -134,6 +138,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
+ <version>3.0.1</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -764,7 +769,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>3.0.0</version>
+ <version>3.0.2</version>
<configuration>
<archive>
<manifest>
@@ -826,16 +831,11 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>3.0.1</version>
+ <version>3.2.0</version>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
-
<artifactId>webstart-maven-plugin</artifactId>
- <version>1.0-beta-7</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
<artifactId>wagon-maven-plugin</artifactId>
<version>1.0</version>
</plugin>
@@ -909,7 +909,17 @@
</licenseFamilies>
</configuration>
</plugin>
-
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+
<artifactId>keytool-maven-plugin</artifactId>
+ <version>1.5</version>
+ </plugin>
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-jarsigner-plugin</artifactId>
+ <version>1.4</version>
+ </plugin>
+
<!--This plugin's configuration is used to
store Eclipse m2e settings only. It has no influence on the Maven build
itself.-->
<plugin>
<groupId>org.eclipse.m2e</groupId>
Modified: openmeetings/application/trunk/openmeetings-screenshare/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-screenshare/pom.xml?rev=1755097&r1=1755096&r2=1755097&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-screenshare/pom.xml (original)
+++ openmeetings/application/trunk/openmeetings-screenshare/pom.xml Wed Aug 3
16:31:17 2016
@@ -37,6 +37,8 @@
<key.alias>screen</key.alias>
<site.basedir>${project.parent.basedir}</site.basedir>
<skip.site.copy>false</skip.site.copy>
+ <jnlp.out.dir>${project.build.directory}/jnlp</jnlp.out.dir>
+ <share.bcprov.version>1.52</share.bcprov.version>
</properties>
<dependencies>
<dependency>
@@ -52,257 +54,137 @@
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15on</artifactId>
+ <version>${share.bcprov.version}</version>
+ </dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestEntries>
-
<Permissions>all-permissions</Permissions>
-
<Trusted-Only>true"</Trusted-Only>
- <Codebase>*</Codebase>
-
<Crypto-Strength>unlimited</Crypto-Strength>
- </manifestEntries>
- </archive>
- </configuration>
- </plugin>
- <!-- plugin> FIXME review after
http://jira.codehaus.org/browse/MWEBSTART-266 is fixed
-
<groupId>com.google.code.maven-replacer-plugin</groupId>
- <artifactId>replacer</artifactId>
+ <artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
- <phase>process-resources</phase>
+ <id>create-template</id>
+
<phase>generate-resources</phase>
<goals>
- <goal>replace</goal>
+
<goal>copy-resources</goal>
</goals>
<configuration>
-
<file>${project.basedir}/src/main/jnlp/templates/template.jnlp</file>
-
<outputFile>${project.build.directory}/APPLICATION_TEMPLATE.jnlp</outputFile>
- <regex>false</regex>
- <replacements>
- <replacement>
-
<token>$applicationName</token>
-
<value>*</value>
- </replacement>
- <replacement>
-
<token>$codebase</token>
-
<value>*</value>
- </replacement>
- <replacement>
-
<token>$protocol</token>
-
<value>*</value>
- </replacement>
- <replacement>
-
<token>$host</token>
-
<value>*</value>
- </replacement>
- <replacement>
-
<token>$port</token>
-
<value>*</value>
- </replacement>
- <replacement>
-
<token>$app</token>
-
<value>*</value>
- </replacement>
- <replacement>
-
<token>$userId</token>
-
<value>*</value>
- </replacement>
- <replacement>
-
<token>$publicSid</token>
-
<value>*</value>
- </replacement>
- <replacement>
-
<token>$labels</token>
-
<value>*</value>
- </replacement>
- <replacement>
-
<token>$defaultQuality</token>
-
<value>*</value>
- </replacement>
- <replacement>
-
<token>$defaultFps</token>
-
<value>*</value>
- </replacement>
- <replacement>
-
<token>$showFps</token>
-
<value>*</value>
- </replacement>
- <replacement>
-
<token>$allowRemote</token>
-
<value>*</value>
- </replacement>
- <replacement>
-
<token>$allowRecording</token>
-
<value>*</value>
- </replacement>
- <replacement>
-
<token>$allowPublishing</token>
-
<value>*</value>
- </replacement>
- <replacement>
-
<token>$keystore</token>
-
<value>*</value>
- </replacement>
- <replacement>
-
<token>$password</token>
-
<value>*</value>
- </replacement>
- </replacements>
+
<outputDirectory>${project.build.directory}</outputDirectory>
+ <resources>
+ <resource>
+
<directory>${project.basedir}/src/main/jnlp/templates</directory>
+
<includes>
+
<include>*.jnlp</include>
+
</includes>
+
<filtering>true</filtering>
+ </resource>
+ </resources>
+
<skip>${skip.site.copy}</skip>
</configuration>
</execution>
</executions>
- </plugin-->
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
-
<id>copy-dependencies</id>
- <phase>package</phase>
- <goals>
-
<goal>copy-dependencies</goal>
- </goals>
- <configuration>
-
<outputDirectory>${project.build.directory}/lib</outputDirectory>
-
<overWriteReleases>false</overWriteReleases>
-
<overWriteSnapshots>false</overWriteSnapshots>
-
<overWriteIfNewer>true</overWriteIfNewer>
-
<excludeTransitive>true</excludeTransitive>
- </configuration>
- </execution>
- </executions>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+
<phase>generate-resources</phase>
+ <configuration>
+ <target>
+ <copy
file="${project.build.directory}/template.jnlp"
tofile="${jnlp.out.dir}/APPLICATION.jnlp" overwrite="true" force="true" />
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
- <artifactId>webstart-maven-plugin</artifactId>
+ <artifactId>keytool-maven-plugin</artifactId>
<executions>
- <!-- execution> FIXME review after
http://jira.codehaus.org/browse/MWEBSTART-266 is fixed
-
<id>generate-jnlp-template-for-signing</id>
- <phase>process-resources</phase>
- <goals>
- <goal>jnlp</goal>
- </goals>
+ <execution>
+
<goals><goal>generateKeyPair</goal></goals>
+
<phase>generate-resources</phase>
<configuration>
-
<excludeTransitive>false</excludeTransitive>
- <dependencies>
- <includes>
-
<include>commons-codec:commons-codec</include>
-
<include>commons-beanutils:commons-beanutils</include>
-
<include>commons-collections:commons-collections</include>
-
<include>org.apache.commons:commons-lang3</include>
-
<include>org.apache.httpcomponents:httpclient</include>
-
<include>org.apache.httpcomponents:httpcore</include>
-
<include>org.bouncycastle:bcprov-jdk15on</include>
-
<include>net.sf.ehcache:ehcache-core</include>
-
<include>org.slf4j:slf4j-api</include>
-
<include>org.slf4j:jcl-over-slf4j</include>
-
<include>ch.qos.logback:logback-core</include>
-
<include>ch.qos.logback:logback-classic</include>
-
<include>org.apache.mina:mina-core</include>
-
<include>org.red5:red5-io</include>
-
<include>org.red5:red5-server-common</include>
-
<include>org.red5:red5-client</include>
-
<include>org.springframework:spring-context</include>
-
<include>org.springframework:spring-core</include>
-
<include>org.springframework:spring-beans</include>
-
<include>org.quartz-scheduler:quartz</include>
- </includes>
- </dependencies>
- <jnlp>
-
<inputTemplateResourcePath>${project.build.directory}</inputTemplateResourcePath>
-
<inputTemplate>APPLICATION_TEMPLATE.jnlp</inputTemplate>
-
<outputFile>APPLICATION_TEMPLATE.jnlp</outputFile>
-
<mainClass>org.apache.openmeetings.screen.webstart.CoreScreenShare</mainClass>
- </jnlp>
-
<makeArchive>false</makeArchive>
+
<keystore>${keystore.location}</keystore>
+
<storepass>${keystore.password}</storepass>
+
<keypass>${key.password}</keypass>
+
<alias>${key.alias}</alias>
+ <dname>cn=Sebastian
Wagner, ou=technolog, o=openmeetings.apache.org, c=DE</dname>
+ <ext></ext>
+ <validity>365</validity>
+ <keyalg>RSA</keyalg>
+ <keysize>4096</keysize>
+
<storetype>${keystore.type}</storetype>
+
<skip>${jarsigner.skip}</skip>
</configuration>
- </execution-->
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
<execution>
-
<id>generate-jnlp-and-sign-libs</id>
+ <id>make-screen-sharing</id>
<phase>package</phase>
<goals>
- <goal>jnlp-inline</goal>
+ <goal>single</goal>
</goals>
<configuration>
-
<excludeTransitive>false</excludeTransitive>
- <dependencies>
- <includes>
-
<include>commons-codec:commons-codec</include>
-
<include>commons-beanutils:commons-beanutils</include>
-
<include>commons-collections:commons-collections</include>
-
<include>org.apache.commons:commons-lang3</include>
-
<include>org.apache.httpcomponents:httpclient</include>
-
<include>org.apache.httpcomponents:httpcore</include>
-
<include>org.bouncycastle:bcprov-jdk15on</include>
-
<include>net.sf.ehcache:ehcache-core</include>
-
<include>org.slf4j:slf4j-api</include>
-
<include>org.slf4j:jcl-over-slf4j</include>
-
<include>ch.qos.logback:logback-core</include>
-
<include>ch.qos.logback:logback-classic</include>
-
<include>org.apache.mina:mina-core</include>
-
<include>org.red5:red5-io</include>
-
<include>org.red5:red5-server-common</include>
-
<include>org.red5:red5-client</include>
-
<include>org.springframework:spring-context</include>
-
<include>org.springframework:spring-core</include>
-
<include>org.springframework:spring-beans</include>
-
<include>org.quartz-scheduler:quartz</include>
- </includes>
- </dependencies>
-
- <jnlp>
-
<inputTemplateResourcePath>${project.basedir}/src/main/jnlp/templates</inputTemplateResourcePath>
-
<inputTemplate>template.jnlp</inputTemplate>
-
<outputFile>APPLICATION.jnlp</outputFile>
-
<mainClass>org.apache.openmeetings.screen.webstart.CoreScreenShare</mainClass>
- </jnlp>
-
- <sign>
-
<keystore>${keystore.location}</keystore>
-
<keypass>${key.password}</keypass>
-
<storepass>${keystore.password}</storepass>
-
<storetype>${keystore.type}</storetype>
-
<alias>${key.alias}</alias>
-
-
<validity>365</validity>
-
<dnameCn>Sebastian Wagner</dnameCn>
-
<dnameOu>technology</dnameOu>
-
<dnameO>openmeetings.apache.org</dnameO>
- <!--
dnameL>Location</dnameL>
-
<dnameSt>State</dnameSt-->
-
<dnameC>DE</dnameC>
-
- <keystoreConfig>
-
<delete>false</delete>
-
<gen>true</gen>
-
</keystoreConfig>
-
<verify>false</verify> <!-- due to self signed certificate -->
- </sign>
- <unsign>false</unsign>
-
<outputJarVersions>false</outputJarVersions>
-
<makeArchive>false</makeArchive>
- <verbose>true</verbose>
+
<descriptor>src/main/assembly/assembly.xml</descriptor>
+
<outputDirectory>${jnlp.out.dir}</outputDirectory>
+ <archive>
+ <manifest>
+
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+
<mainClass>org.apache.openmeetings.screen.webstart.CoreScreenShare</mainClass>
+ </manifest>
+
<manifestEntries>
+
<Application-Name>${project.name}</Application-Name>
+
<Built-By>OpenMeetings - http://openmeetings.apache.org</Built-By>
+
<Built-On>${maven.build.timestamp}</Built-On>
+
<Svn-Revision>${buildNumber}</Svn-Revision>
+
<Product-Version>${project.version}</Product-Version>
+
<Permissions>all-permissions</Permissions>
+
<Trusted-Only>true</Trusted-Only>
+
<Codebase>*</Codebase>
+
<Crypto-Strength>unlimited</Crypto-Strength>
+
</manifestEntries>
+ </archive>
</configuration>
</execution>
</executions>
</plugin>
- <!-- plugin> FIXME review after
http://jira.codehaus.org/browse/MWEBSTART-266 is fixed
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>truezip-maven-plugin</artifactId>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
- <id>move-jnlp-template</id>
+ <id>copy-bcprov</id>
+ <phase>prepare-package</phase>
<goals>
- <goal>move</goal>
+ <goal>copy</goal>
</goals>
- <phase>verify</phase>
<configuration>
-
<from>${project.build.directory}/jnlp/APPLICATION_TEMPLATE.jnlp</from>
-
<to>${project.build.directory}/jnlp/${project.build.finalName}.jar/JNLP-INF/APPLICATION_TEMPLATE.jnlp</to>
+
<outputDirectory>${jnlp.out.dir}</outputDirectory>
+ <artifactItems>
+ <artifactItem>
+
<groupId>org.bouncycastle</groupId>
+
<artifactId>bcprov-jdk15on</artifactId>
+ </artifactItem>
+ </artifactItems>
+
<overWriteReleases>true</overWriteReleases>
+
<overWriteSnapshots>true</overWriteSnapshots>
+
<overWriteIfNewer>true</overWriteIfNewer>
+
<excludeTransitive>true</excludeTransitive>
</configuration>
</execution>
</executions>
@@ -312,27 +194,21 @@
<artifactId>maven-jarsigner-plugin</artifactId>
<executions>
<execution>
- <id>sign</id>
- <phase>verify</phase>
- <goals>
- <goal>sign</goal>
- </goals>
+ <id>sign-applet</id>
+ <phase>package</phase>
+ <goals><goal>sign</goal></goals>
+ <configuration>
+
<archiveDirectory>${jnlp.out.dir}</archiveDirectory>
+
<keystore>${keystore.location}</keystore>
+
<keypass>${key.password}</keypass>
+
<storepass>${keystore.password}</storepass>
+
<storetype>${keystore.type}</storetype>
+
<alias>${key.alias}</alias>
+
<arguments><argument>-digestalg</argument><argument>SHA1</argument></arguments>
+ </configuration>
</execution>
</executions>
- <configuration>
-
<archiveDirectory>${project.build.directory}/jnlp</archiveDirectory>
- <includes>
-
<include>${project.build.finalName}.jar</include>
- </includes>
-
<keystore>${keystore.location}</keystore>
- <keypass>${key.password}</keypass>
-
<storepass>${keystore.password}</storepass>
- <storetype>${keystore.type}</storetype>
- <alias>${key.alias}</alias>
-
<removeExistingSignatures>true</removeExistingSignatures>
- <verbose>true</verbose>
- </configuration>
- </plugin-->
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
@@ -359,11 +235,11 @@
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
-
<groupId>org.codehaus.mojo</groupId>
-
<artifactId>webstart-maven-plugin</artifactId>
-
<versionRange>[1.0-beta-6,)</versionRange>
+
<groupId>com.google.code.maven-replacer-plugin</groupId>
+
<artifactId>replacer</artifactId>
+
<versionRange>[1.5.3,)</versionRange>
<goals>
-
<goal>jnlp</goal>
+
<goal>replace</goal>
</goals>
</pluginExecutionFilter>
<action>
@@ -372,11 +248,36 @@
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
-
<groupId>com.google.code.maven-replacer-plugin</groupId>
-
<artifactId>replacer</artifactId>
-
<versionRange>[1.5.3,)</versionRange>
+
<groupId>
+
org.apache.maven.plugins
+
</groupId>
+
<artifactId>
+
maven-antrun-plugin
+
</artifactId>
+
<versionRange>
+
[1.8,)
+
</versionRange>
<goals>
-
<goal>replace</goal>
+
<goal>run</goal>
+
</goals>
+
</pluginExecutionFilter>
+ <action>
+
<ignore></ignore>
+
</action>
+
</pluginExecution>
+
<pluginExecution>
+
<pluginExecutionFilter>
+
<groupId>
+
org.codehaus.mojo
+
</groupId>
+
<artifactId>
+
keytool-maven-plugin
+
</artifactId>
+
<versionRange>
+
[1.5,)
+
</versionRange>
+
<goals>
+
<goal>generateKeyPair</goal>
</goals>
</pluginExecutionFilter>
<action>
Added:
openmeetings/application/trunk/openmeetings-screenshare/src/main/assembly/assembly.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-screenshare/src/main/assembly/assembly.xml?rev=1755097&view=auto
==============================================================================
---
openmeetings/application/trunk/openmeetings-screenshare/src/main/assembly/assembly.xml
(added)
+++
openmeetings/application/trunk/openmeetings-screenshare/src/main/assembly/assembly.xml
Wed Aug 3 16:31:17 2016
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<assembly>
+ <id>full</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>commons-codec:commons-codec</include>
+
<include>commons-beanutils:commons-beanutils</include>
+
<include>commons-collections:commons-collections</include>
+
<include>org.apache.commons:commons-lang3</include>
+
<include>org.apache.httpcomponents:httpclient</include>
+
<include>org.apache.httpcomponents:httpcore</include>
+
<include>org.bouncycastle:bcprov-jdk15on</include>
+ <include>net.sf.ehcache:ehcache-core</include>
+ <include>org.slf4j:slf4j-api</include>
+ <include>org.slf4j:jcl-over-slf4j</include>
+ <include>ch.qos.logback:logback-core</include>
+
<include>ch.qos.logback:logback-classic</include>
+ <include>org.apache.mina:mina-core</include>
+ <include>org.red5:red5-io</include>
+ <include>org.red5:red5-server-common</include>
+ <include>org.red5:red5-client</include>
+
<include>org.springframework:spring-context</include>
+
<include>org.springframework:spring-core</include>
+
<include>org.springframework:spring-beans</include>
+ <include>org.quartz-scheduler:quartz</include>
+ </includes>
+ <unpack>true</unpack>
+ <scope>runtime</scope>
+ <useProjectArtifact>true</useProjectArtifact>
+ </dependencySet>
+ </dependencySets>
+ <fileSets>
+ <fileSet>
+ <directory>${project.build.outputDirectory}</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
Modified:
openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java?rev=1755097&r1=1755096&r2=1755097&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
(original)
+++
openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screen/webstart/CoreScreenShare.java
Wed Aug 3 16:31:17 2016
@@ -173,7 +173,7 @@ public class CoreScreenShare implements
public static void main(String[] args) {
new CoreScreenShare(args);
}
-
+
//
------------------------------------------------------------------------
//
// GUI
Modified:
openmeetings/application/trunk/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp?rev=1755097&r1=1755096&r2=1755097&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp
(original)
+++
openmeetings/application/trunk/openmeetings-screenshare/src/main/jnlp/templates/template.jnlp
Wed Aug 3 16:31:17 2016
@@ -19,13 +19,13 @@
-->
<jnlp spec="6.0+" codebase="$codebase">
<information>
- <title>$informationTitle</title>
+ <title>${project.name}</title>
<vendor>$applicationName</vendor>
- <homepage>$informationHomepage</homepage>
+ <homepage>${project.organization.url}</homepage>
<icon href="icon.png" />
<icon kind="splash" href="splashicon.png" />
- <description>$informationTitle</description>
- <description kind="short">$informationDescription</description>
+ <description>${project.description}</description>
+ <description kind="short">${project.description}</description>
<offline-allowed/>
</information>
<security>
@@ -33,9 +33,10 @@
</security>
<resources>
<j2se version='1.7+'/>
- $dependencies
+ <jar href="bcprov-jdk15on-${share.bcprov.version}.jar"
main="true"/>
+ <jar
href="openmeetings-screenshare-${project.version}-full.jar" main="true"/>
</resources>
- <application-desc main-class='$mainClass'>
+ <application-desc
main-class='org.apache.openmeetings.screen.webstart.CoreScreenShare'>
<argument>$url</argument>
<argument>$publicSid</argument>
<argument>$labels</argument>
Modified:
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/ReleaseGuide.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-server/src/site/xdoc/ReleaseGuide.xml?rev=1755097&r1=1755096&r2=1755097&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/ReleaseGuide.xml
(original)
+++
openmeetings/application/trunk/openmeetings-server/src/site/xdoc/ReleaseGuide.xml
Wed Aug 3 16:31:17 2016
@@ -194,10 +194,8 @@ mkdir apache-openmeetings
cd apache-openmeetings
tar -xzf ../apache-openmeetings-$BRANCHORTAG.tar.gz
cd webapps/openmeetings/screenshare/
-mvn org.codehaus.mojo:webstart-maven-plugin:1.0-beta-8-SNAPSHOT:unsign
-Dmaven.jar.unsign.jarpath=.
</source>
</li>
- <li>Check any jar in
<tt>webapps/openmeetings/screenshare/</tt>: Its META-INF/MANIFEST.MF file
should NOT contain <tt>SHA1-Digest</tt> entries for classes</li>
<li>Go to <a
href="https://securesigning.websecurity.symantec.com/csportal/";>https://securesigning.websecurity.symantec.com/csportal/</a></li>
<li>Select "Signing Sets"</li>
<li>Select "Add signing set"</li>
Modified: openmeetings/application/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/pom.xml?rev=1755097&r1=1755096&r2=1755097&view=diff
==============================================================================
--- openmeetings/application/trunk/pom.xml (original)
+++ openmeetings/application/trunk/pom.xml Wed Aug 3 16:31:17 2016
@@ -109,11 +109,15 @@
</profile>
<profile>
<id>release</id>
+ <properties>
+ <jarsigner.skip>true</jarsigner.skip>
+ </properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.4.1</version>
<executions>
<execution>
<id>enforce-versions</id>
@@ -134,6 +138,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
+ <version>3.0.1</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -764,7 +769,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>3.0.0</version>
+ <version>3.0.2</version>
<configuration>
<archive>
<manifest>
@@ -826,16 +831,11 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>3.0.1</version>
+ <version>3.2.0</version>
<extensions>true</extensions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
-
<artifactId>webstart-maven-plugin</artifactId>
- <version>1.0-beta-7</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
<artifactId>wagon-maven-plugin</artifactId>
<version>1.0</version>
</plugin>
@@ -909,7 +909,17 @@
</licenseFamilies>
</configuration>
</plugin>
-
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+
<artifactId>keytool-maven-plugin</artifactId>
+ <version>1.5</version>
+ </plugin>
+ <plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-jarsigner-plugin</artifactId>
+ <version>1.4</version>
+ </plugin>
+
<!--This plugin's configuration is used to
store Eclipse m2e settings only. It has no influence on the Maven build
itself.-->
<plugin>
<groupId>org.eclipse.m2e</groupId>
