You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2012/08/08 16:34:37 UTC
svn commit: r1370786 - in /incubator/openmeetings/trunk/plugins/drupal: ./
sites/all/modules/openmeetings/ sites/all/modules/openmeetings/lib/
Author: sebawagner
Date: Wed Aug 8 14:34:35 2012
New Revision: 1370786
URL: http://svn.apache.org/viewvc?rev=1370786&view=rev
Log:
Integrate RAT fix missing license headers
Added:
incubator/openmeetings/trunk/plugins/drupal/ivy.xml
incubator/openmeetings/trunk/plugins/drupal/ivysettings.xml
incubator/openmeetings/trunk/plugins/drupal/ivysettings.xsd
Modified:
incubator/openmeetings/trunk/plugins/drupal/.project
incubator/openmeetings/trunk/plugins/drupal/build.xml
incubator/openmeetings/trunk/plugins/drupal/sites/all/modules/openmeetings/lib/openmeetings_rest_service.php
incubator/openmeetings/trunk/plugins/drupal/sites/all/modules/openmeetings/openmeetings.info
incubator/openmeetings/trunk/plugins/drupal/sites/all/modules/openmeetings/openmeetings.install
incubator/openmeetings/trunk/plugins/drupal/sites/all/modules/openmeetings/openmeetings.module
incubator/openmeetings/trunk/plugins/drupal/sites/all/modules/openmeetings/openmeetingsRoomManagament.php
incubator/openmeetings/trunk/plugins/drupal/sites/all/modules/openmeetings/openmeetings_conference.php
Modified: incubator/openmeetings/trunk/plugins/drupal/.project
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/drupal/.project?rev=1370786&r1=1370785&r2=1370786&view=diff
==============================================================================
--- incubator/openmeetings/trunk/plugins/drupal/.project (original)
+++ incubator/openmeetings/trunk/plugins/drupal/.project Wed Aug 8 14:34:35 2012
@@ -1,4 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed 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.
+ -->
+ <?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>drupal_7.x</name>
<comment></comment>
Modified: incubator/openmeetings/trunk/plugins/drupal/build.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/drupal/build.xml?rev=1370786&r1=1370785&r2=1370786&view=diff
==============================================================================
--- incubator/openmeetings/trunk/plugins/drupal/build.xml (original)
+++ incubator/openmeetings/trunk/plugins/drupal/build.xml Wed Aug 8 14:34:35 2012
@@ -14,7 +14,9 @@
-->
<!DOCTYPE project>
<project name="openmeetings drupal plugin" basedir="./" default="dist-bin"
- xmlns="antlib:org.apache.tools.ant">
+ xmlns="antlib:org.apache.tools.ant"
+ xmlns:rat="antlib:org.apache.rat.anttasks"
+ xmlns:ivy="antlib:org.apache.ivy.ant">
<property name="dist.dir" value="dist" />
<property name="project.version" value="1.0" />
@@ -24,12 +26,12 @@
<target name="dist-bin" depends="clean">
<property name="archive.file.name" value="${dist.dir}/apache-${project.distname}-incubating-${project.version}" />
- <mkdir dir="${dist.dir}"/>
+ <mkdir dir="${dist.dir}" />
<copy todir="${dist.dir}">
<fileset dir="${basedir}">
- <exclude name=".*"/>
- <exclude name="dist/**"/>
- <exclude name="build.xml"/>
+ <exclude name=".*" />
+ <exclude name="dist/**" />
+ <exclude name="build.xml" />
</fileset>
</copy>
<zip destfile="${archive.file.name}.zip" filesonly="false">
@@ -42,7 +44,7 @@
<exclude name="*dist/**" />
</zipfileset>
</zip>
- <tar longfile="gnu" compression="gzip" destfile="${archive.file.name}.tar.gz" >
+ <tar longfile="gnu" compression="gzip" destfile="${archive.file.name}.tar.gz">
<tarfileset dir="${dist.dir}">
<include name="sites/**/**" />
</tarfileset>
@@ -58,4 +60,41 @@
<delete includeemptydirs="true" dir="${dist.dir}" />
</target>
+ <!-- RAT -->
+ <property name="ivy.install.version" value="2.3.0-rc1" />
+ <property name="project.lib.dir" value="${dist.dir}" />
+ <property name="ivy.jar.path" value="${project.lib.dir}/ivy-${ivy.install.version}.jar" />
+
+ <available file="${ivy.jar.path}" type="file" property="ivy.installed" />
+ <target name="-download-ivy" unless="ivy.installed">
+ <mkdir dir="${project.lib.dir}" />
+ <echo message="Downloading ivy..." />
+ <get src="http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar" dest="${ivy.jar.path}" usetimestamp="true" />
+ </target>
+
+ <path id="rat.classpath">
+ <fileset dir="${project.lib.dir}" includes="*.jar" />
+ </path>
+ <target name="-availability-check" unless="red5.installed" description="Check which libraries need to be retrieved">
+ <mkdir dir="${project.lib.dir}" />
+ <available classpathref="rat.classpath" classname="org.apache.rat.Report" property="rat.installed" />
+ </target>
+ <!-- Check for rat libraries -->
+ <target name="-retrieve-rat" unless="rat.installed" description="Retrieves the libraries if needed" depends="-availability-check, -download-ivy">
+ <taskdef uri="antlib:org.apache.ivy.ant" resource="org/apache/ivy/ant/antlib.xml" classpath="${ivy.jar.path}" />
+
+ <ivy:resolve file="ivy.xml" checkIfChanged="false" transitive="false" />
+ <ivy:retrieve pattern="${project.lib.dir}/[artifact]-[type]-[revision].[ext]" />
+ </target>
+
+ <target name="report_rat" depends="-retrieve-rat">
+ <taskdef uri="antlib:org.apache.rat.anttasks" resource="org/apache/rat/anttasks/antlib.xml" classpathref="rat.classpath" />
+
+ <rat:report>
+ <fileset dir="${basedir}">
+ <exclude name="*dist/**" />
+ </fileset>
+ </rat:report>
+ </target>
+
</project>
\ No newline at end of file
Added: incubator/openmeetings/trunk/plugins/drupal/ivy.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/drupal/ivy.xml?rev=1370786&view=auto
==============================================================================
--- incubator/openmeetings/trunk/plugins/drupal/ivy.xml (added)
+++ incubator/openmeetings/trunk/plugins/drupal/ivy.xml Wed Aug 8 14:34:35 2012
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed 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.
+ -->
+<ivy-module version="2.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://ant.apache.org/ivy/schemas/ivy.xsd">
+ <info organisation="apache" module="openmeetings" />
+ <configurations defaultconfmapping="default">
+ <conf name="default" />
+ </configurations>
+ <dependencies>
+ <dependency org="org.apache.rat" name="apache-rat-core" rev="0.8" transitive="false">
+ <include type="jar" />
+ </dependency>
+ <dependency org="org.apache.rat" name="apache-rat-tasks" rev="0.8" transitive="false">
+ <include type="jar" />
+ </dependency>
+ <dependency org="commons-cli" name="commons-cli" rev="1.2" transitive="false">
+ <include type="jar" />
+ </dependency>
+ <dependency org="commons-io" name="commons-io" rev="2.1" transitive="false">
+ <include type="jar" />
+ </dependency>
+ <dependency org="org.apache.commons" name="commons-collections" rev="3.2.1">
+ <include type="jar" />
+ </dependency>
+ <dependency org="commons-lang" name="commons-lang" rev="2.6" transitive="false">
+ <include type="jar" />
+ </dependency>
+ </dependencies>
+</ivy-module>
+
Added: incubator/openmeetings/trunk/plugins/drupal/ivysettings.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/drupal/ivysettings.xml?rev=1370786&view=auto
==============================================================================
--- incubator/openmeetings/trunk/plugins/drupal/ivysettings.xml (added)
+++ incubator/openmeetings/trunk/plugins/drupal/ivysettings.xml Wed Aug 8 14:34:35 2012
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed 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.
+ -->
+<ivysettings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="ivysettings.xsd">
+ <settings defaultResolver="chain"/>
+ <resolvers>
+ <chain name="chain">
+ <ibiblio name="central" m2compatible="true"/>
+ </chain>
+ </resolvers>
+</ivysettings>
+
Added: incubator/openmeetings/trunk/plugins/drupal/ivysettings.xsd
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/drupal/ivysettings.xsd?rev=1370786&view=auto
==============================================================================
--- incubator/openmeetings/trunk/plugins/drupal/ivysettings.xsd (added)
+++ incubator/openmeetings/trunk/plugins/drupal/ivysettings.xsd Wed Aug 8 14:34:35 2012
@@ -0,0 +1,87 @@
+<?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.
+
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
+ <xs:element name="ivysettings">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="settings"/>
+ <xs:element ref="resolvers"/>
+ <xs:element ref="triggers"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="settings">
+ <xs:complexType>
+ <xs:attribute name="defaultResolver" use="required" type="xs:NCName"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="resolvers">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="chain"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="chain">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" ref="ibiblio"/>
+ <xs:element maxOccurs="unbounded" ref="url"/>
+ </xs:sequence>
+ <xs:attribute name="name" use="required" type="xs:NCName"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="ibiblio">
+ <xs:complexType>
+ <xs:attribute name="m2compatible" use="required" type="xs:boolean"/>
+ <xs:attribute name="name" use="required" type="xs:NCName"/>
+ <xs:attribute name="root" type="xs:anyURI"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="url">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element maxOccurs="unbounded" ref="artifact"/>
+ </xs:sequence>
+ <xs:attribute name="name" use="required" type="xs:NCName"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="artifact">
+ <xs:complexType>
+ <xs:attribute name="pattern" use="required"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="triggers">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="ant-call"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="ant-call">
+ <xs:complexType>
+ <xs:attribute name="event" use="required" type="xs:NCName"/>
+ <xs:attribute name="filter" use="required"/>
+ <xs:attribute name="prefix" use="required" type="xs:NCName"/>
+ <xs:attribute name="target" use="required" type="xs:NMTOKEN"/>
+ </xs:complexType>
+ </xs:element>
+</xs:schema>
Modified: incubator/openmeetings/trunk/plugins/drupal/sites/all/modules/openmeetings/lib/openmeetings_rest_service.php
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/drupal/sites/all/modules/openmeetings/lib/openmeetings_rest_service.php?rev=1370786&r1=1370785&r2=1370786&view=diff
==============================================================================
--- incubator/openmeetings/trunk/plugins/drupal/sites/all/modules/openmeetings/lib/openmeetings_rest_service.php (original)
+++ incubator/openmeetings/trunk/plugins/drupal/sites/all/modules/openmeetings/lib/openmeetings_rest_service.php Wed Aug 8 14:34:35 2012
@@ -17,12 +17,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-/*
- * Created on 03.01.2012 by eugen.schwert@gmail.com
- *
- *
- */
-
class openmeetings_rest_service {
var $current_call;
Modified: incubator/openmeetings/trunk/plugins/drupal/sites/all/modules/openmeetings/openmeetings.info
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/drupal/sites/all/modules/openmeetings/openmeetings.info?rev=1370786&r1=1370785&r2=1370786&view=diff
==============================================================================
--- incubator/openmeetings/trunk/plugins/drupal/sites/all/modules/openmeetings/openmeetings.info (original)
+++ incubator/openmeetings/trunk/plugins/drupal/sites/all/modules/openmeetings/openmeetings.info Wed Aug 8 14:34:35 2012
@@ -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.
+;
; $Id$
name = OpenMeetings
description = OpenMeetings integration module. OpenMeetings is a video conference system.<BR>More information on <a href="http://incubator.apache.org/openmeetings/" target="_blank">Apache OpenMeetings [Incubating]</a>.
Modified: incubator/openmeetings/trunk/plugins/drupal/sites/all/modules/openmeetings/openmeetings.install
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/drupal/sites/all/modules/openmeetings/openmeetings.install?rev=1370786&r1=1370785&r2=1370786&view=diff
==============================================================================
--- incubator/openmeetings/trunk/plugins/drupal/sites/all/modules/openmeetings/openmeetings.install (original)
+++ incubator/openmeetings/trunk/plugins/drupal/sites/all/modules/openmeetings/openmeetings.install Wed Aug 8 14:34:35 2012
@@ -1,5 +1,22 @@
<?php
-
+/*
+ * 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.
+*/
/**
* @file
* OpenMeetings Integration Module : Installation
Modified: incubator/openmeetings/trunk/plugins/drupal/sites/all/modules/openmeetings/openmeetings.module
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/drupal/sites/all/modules/openmeetings/openmeetings.module?rev=1370786&r1=1370785&r2=1370786&view=diff
==============================================================================
--- incubator/openmeetings/trunk/plugins/drupal/sites/all/modules/openmeetings/openmeetings.module (original)
+++ incubator/openmeetings/trunk/plugins/drupal/sites/all/modules/openmeetings/openmeetings.module Wed Aug 8 14:34:35 2012
@@ -1,5 +1,22 @@
<?php
-
+/*
+ * 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.
+*/
/**
* @file
* OpenMeetins Integration Module
Modified: incubator/openmeetings/trunk/plugins/drupal/sites/all/modules/openmeetings/openmeetingsRoomManagament.php
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/drupal/sites/all/modules/openmeetings/openmeetingsRoomManagament.php?rev=1370786&r1=1370785&r2=1370786&view=diff
==============================================================================
--- incubator/openmeetings/trunk/plugins/drupal/sites/all/modules/openmeetings/openmeetingsRoomManagament.php (original)
+++ incubator/openmeetings/trunk/plugins/drupal/sites/all/modules/openmeetings/openmeetingsRoomManagament.php Wed Aug 8 14:34:35 2012
@@ -1,5 +1,22 @@
<?php
-
+/*
+ * 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.
+*/
require_once("openmeetings_gateway.php");
Modified: incubator/openmeetings/trunk/plugins/drupal/sites/all/modules/openmeetings/openmeetings_conference.php
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/plugins/drupal/sites/all/modules/openmeetings/openmeetings_conference.php?rev=1370786&r1=1370785&r2=1370786&view=diff
==============================================================================
--- incubator/openmeetings/trunk/plugins/drupal/sites/all/modules/openmeetings/openmeetings_conference.php (original)
+++ incubator/openmeetings/trunk/plugins/drupal/sites/all/modules/openmeetings/openmeetings_conference.php Wed Aug 8 14:34:35 2012
@@ -1,3 +1,23 @@
+<?
+/*
+* 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.
+*/
+?>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"></head>