Author: solomax
Date: Wed Apr 22 17:54:54 2015
New Revision: 1675445
URL: http://svn.apache.org/r1675445
Log:
[OPENMEETINGS-980] dependency to googlecode is removed, missing license headers
are added
Modified:
openmeetings/trunk/singlewebapp/openmeetings-db/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-flash/openlaszlo.xml
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractAppointmentTemplate.java
openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/Activity.java
openmeetings/trunk/singlewebapp/pom.xml
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/pom.xml?rev=1675445&r1=1675444&r2=1675445&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/pom.xml Wed Apr 22 17:54:54
2015
@@ -31,7 +31,7 @@
<description>TODO</description>
<properties>
<openjpa.version>2.3.0</openjpa.version>
- <asterisk-java.version>1.0.0.CI-SNAPSHOT</asterisk-java.version>
+ <asterisk-java.version>1.0.0.CI-20150406</asterisk-java.version>
<commons-dbcp.version>2.1</commons-dbcp.version>
<derby.version>10.11.1.1</derby.version>
<postgresql.version>9.4-1200-jdbc41</postgresql.version>
@@ -89,8 +89,8 @@
</dependencies>
<repositories>
<repository>
- <id>openmeetings-googlecode</id>
-
<url>https://openmeetings.googlecode.com/svn/repository/</url>
+ <id>openmeetings-bintray</id>
+ <url>https://dl.bintray.com/openmeetings/maven</url>
</repository>
</repositories>
<build>
Modified: openmeetings/trunk/singlewebapp/openmeetings-flash/openlaszlo.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-flash/openlaszlo.xml?rev=1675445&r1=1675444&r2=1675445&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-flash/openlaszlo.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-flash/openlaszlo.xml Wed Apr
22 17:54:54 2015
@@ -122,7 +122,7 @@
</target>
<target name="-retrieve-openlaszlo46" unless="laszlo46.installed"
description="Retrieves the libraries if needed" depends="-availability-check">
<mkdir dir="${openlaszlo}"/>
- <get
src="http://openlaszlo-openmeetings-integration.googlecode.com/svn/repository/openlaszlo-4.9.5.tgz";
+ <get
src="https://dl.bintray.com/openmeetings/maven/org/openlaszlo/openlaszlo/4.9.5/openlaszlo-4.9.5.tgz";
dest="${openlaszlo}" usetimestamp="true"/>
<untar src="${openlaszlo}/openlaszlo-4.9.5.tgz"
dest="${openlaszlo}" compression="gzip" />
<chmod dir="${laszlo46.home}/WEB-INF/flexsdk" perm="755"
includes="**/mxmlc*" />
Modified:
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java?rev=1675445&r1=1675444&r2=1675445&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/EmailManager.java
Wed Apr 22 17:54:54 2015
@@ -22,13 +22,11 @@ import static org.apache.openmeetings.ut
import static
org.apache.openmeetings.util.OpenmeetingsVariables.wicketApplicationName;
import org.apache.openmeetings.IApplication;
-import org.apache.openmeetings.IWebSession;
import org.apache.openmeetings.core.mail.MailHandler;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.service.mail.template.FeedbackTemplate;
import org.apache.openmeetings.service.mail.template.RegisterUserTemplate;
import org.apache.wicket.Application;
-import org.apache.wicket.protocol.http.WebSession;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
Modified:
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractAppointmentTemplate.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractAppointmentTemplate.java?rev=1675445&r1=1675444&r2=1675445&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractAppointmentTemplate.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/AbstractAppointmentTemplate.java
Wed Apr 22 17:54:54 2015
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.openmeetings.service.mail.template;
import java.util.TimeZone;
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml?rev=1675445&r1=1675444&r2=1675445&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/pom.xml Wed Apr 22
17:54:54 2015
@@ -164,20 +164,41 @@
</executions>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>wagon-maven-plugin</artifactId>
+ <groupId>com.soebes.maven.plugins</groupId>
+ <artifactId>iterator-maven-plugin</artifactId>
<executions>
<execution>
<id>download-test-data</id>
<phase>process-resources</phase>
<goals>
- <goal>download</goal>
+ <goal>iterator</goal>
</goals>
<configuration>
-
<url>https://openmeetings.googlecode.com/svn/repository</url>
-
<includes>backup_*.zip</includes>
-
<toDir>${old-backups.dir}</toDir>
-
<skip>${old-backups.dwnd.skip}</skip>
+ <items>
+
<item>backup_v_1_4_rc1_r3326.zip</item>
+
<item>backup_v_1_5_rc1_r3393.zip</item>
+
<item>backup_v_1_6_2_r3675.zip</item>
+
<item>backup_v_1_7_0_r3822.zip</item>
+
<item>backup_v_1_8_8_r4555.zip</item>
+
<item>backup_v_1_9_1_r4707.zip</item>
+
<item>backup_v_2_0_0_r1361497.zip</item>
+
<item>backup_v_3_0_0_r1573585.zip</item>
+ </items>
+ <pluginExecutors>
+ <pluginExecutor>
+ <plugin>
+
<groupId>org.codehaus.mojo</groupId>
+
<artifactId>wagon-maven-plugin</artifactId>
+
</plugin>
+
<goal>download-single</goal>
+
<configuration>
+
<url>https://dl.bintray.com/openmeetings/generic/backups/</url>
+
<fromFile>@item@</fromFile>
+
<toDir>${old-backups.dir}</toDir>
+
<skip>${old-backups.dwnd.skip}</skip>
+
</configuration>
+
</pluginExecutor>
+ </pluginExecutors>
</configuration>
</execution>
</executions>
@@ -209,6 +230,11 @@
</testResources>
<pluginManagement>
<plugins>
+ <plugin>
+
<groupId>com.soebes.maven.plugins</groupId>
+
<artifactId>iterator-maven-plugin</artifactId>
+ <version>0.3</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>
@@ -266,6 +292,25 @@
</goals>
</pluginExecutionFilter>
<action>
+
<ignore></ignore>
+
</action>
+
</pluginExecution>
+
<pluginExecution>
+
<pluginExecutionFilter>
+
<groupId>
+
com.soebes.maven.plugins
+
</groupId>
+
<artifactId>
+
iterator-maven-plugin
+
</artifactId>
+
<versionRange>
+
[0.3,)
+
</versionRange>
+
<goals>
+
<goal>iterator</goal>
+
</goals>
+
</pluginExecutionFilter>
+ <action>
<ignore></ignore>
</action>
</pluginExecution>
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/Activity.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/Activity.java?rev=1675445&r1=1675444&r2=1675445&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/Activity.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/Activity.java
Wed Apr 22 17:54:54 2015
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.openmeetings.web.room.activities;
import java.io.Serializable;
Modified: openmeetings/trunk/singlewebapp/pom.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/pom.xml?rev=1675445&r1=1675444&r2=1675445&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/pom.xml Wed Apr 22 17:54:54 2015
@@ -795,7 +795,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>wagon-maven-plugin</artifactId>
- <version>1.0-beta-5</version>
+ <version>1.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
