Author: solomax
Date: Wed Apr 22 15:52:29 2015
New Revision: 1675395
URL: http://svn.apache.org/r1675395
Log:
[OPENMEETINGS-1184] dependency from googlecode is removed, missing license
header is added
Modified:
openmeetings/branches/3.0.x/build.xml
openmeetings/branches/3.0.x/ivy.xml
openmeetings/branches/3.0.x/ivysettings.xml
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/AbstractAppointmentTemplate.java
Modified: openmeetings/branches/3.0.x/build.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/build.xml?rev=1675395&r1=1675394&r2=1675395&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/build.xml (original)
+++ openmeetings/branches/3.0.x/build.xml Wed Apr 22 15:52:29 2015
@@ -1066,7 +1066,7 @@
</not>
<then>
<echo message="Backup file
@{prop} does not exists. Downloading ..." />
- <get
src="http://openmeetings.googlecode.com/svn/repository/@{prop}";
dest="${junit.backups.dir}" usetimestamp="true"/>
+ <get
src="https://dl.bintray.com/openmeetings/generic/backups/@{prop}";
dest="${junit.backups.dir}" usetimestamp="true"/>
</then>
</if>
</sequential>
Modified: openmeetings/branches/3.0.x/ivy.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/ivy.xml?rev=1675395&r1=1675394&r2=1675395&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/ivy.xml (original)
+++ openmeetings/branches/3.0.x/ivy.xml Wed Apr 22 15:52:29 2015
@@ -295,7 +295,7 @@
<dependency org="org.smslib" name="smslib" rev="3.5.4"
conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.asteriskjava" name="asterisk-java"
rev="1.0.0.CI-20130102.214528-1134" conf="openmeetings->*" transitive="false">
+ <dependency org="org.asteriskjava" name="asterisk-java"
rev="1.0.0.CI-20150406" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
<!-- Selenium -->
@@ -383,23 +383,23 @@
<dependency org="org.tmatesoft.svnkit" name="svnkit"
rev="1.7.11" conf="svntask->*" transitive="true">
<include type="jar" />
</dependency>
- <dependency org="svnant" name="svnant" rev="1.3.1"
conf="svntask->*" transitive="false">
+ <dependency org="org.tigris.subclipse" name="svnant"
rev="1.3.1" conf="svntask->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="svnClientAdapter" name="svnClientAdapter"
rev="1.3.1" conf="svntask->*" transitive="false">
+ <dependency org="org.tigris.subclipse" name="svnclientadapter"
rev="1.3.1" conf="svntask->*" transitive="false">
<include type="jar" />
</dependency>
<!-- END OF svntask -->
<!-- START OF openlaszlo -->
- <dependency org="openlaszlo" name="openlaszlo" rev="4.9"
conf="openlaszlo->*" transitive="false">
+ <dependency org="org.openlaszlo" name="openlaszlo" rev="4.9"
conf="openlaszlo->*" transitive="false">
<artifact name="openlaszlo" type="tgz"/>
<include type="tgz" />
</dependency>
<!-- END OF openlaszlo -->
<!-- START OF openlaszlo46 -->
- <dependency org="openlaszlo" name="openlaszlo" rev="4.9.5"
conf="openlaszlo46->*" transitive="false">
+ <dependency org="org.openlaszlo" name="openlaszlo" rev="4.9.5"
conf="openlaszlo46->*" transitive="false">
<artifact name="openlaszlo" type="tgz"/>
<include type="tgz" />
</dependency>
Modified: openmeetings/branches/3.0.x/ivysettings.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/ivysettings.xml?rev=1675395&r1=1675394&r2=1675395&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/ivysettings.xml (original)
+++ openmeetings/branches/3.0.x/ivysettings.xml Wed Apr 22 15:52:29 2015
@@ -29,11 +29,8 @@
<url name="svnkit" m2compatible="true">
<artifact
pattern="http://maven.tmatesoft.com/content/repositories/releases/[organisation]/[artifact]/[revision]/[artifact]-[revision].[ext]";
/>
</url>
- <url name="googlecode" m2compatible="true">
- <artifact
pattern="https://openlaszlo-openmeetings-integration.googlecode.com/svn/repository/[artifact](-[revision]).[ext]"
/>
- <artifact
pattern="https://openmeetings.googlecode.com/svn/repository/[artifact](-[revision]).[ext]"
/>
- <artifact
pattern="https://openmeetings.googlecode.com/svn/repository/[organisation]/[artifact]/[revision]/[artifact](-[revision]).[ext]"
/>
- <artifact
pattern="https://red5.googlecode.com/svn/repository/[organisation]/[artifact]/[revision]/[artifact](-[revision]).[ext]"
/>
+ <url name="bintray" m2compatible="true">
+ <artifact
pattern="https://dl.bintray.com/openmeetings/maven/[organisation]/[artifact]/[revision]/[artifact](-[revision]).[ext]"
/>
</url>
<url name="smslib" m2compatible="true">
<artifact
pattern="http://smslib.org/maven2/v3/[organisation]/[artifact]/[revision]/[artifact]-[revision].[ext]";
/>
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/AbstractAppointmentTemplate.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/AbstractAppointmentTemplate.java?rev=1675395&r1=1675394&r2=1675395&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/AbstractAppointmentTemplate.java
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/mail/template/AbstractAppointmentTemplate.java
Wed Apr 22 15:52:29 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.mail.template;
import java.util.TimeZone;
