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/07/07 10:25:34 UTC
svn commit: r1358525 - in /incubator/openmeetings/branches/2.0: ./
WebContent/ WebContent/META-INF/ WebContent/WEB-INF/ WebContent/languages/
WebContent/openmeetings/ WebContent/red5/ WebContent/src/
WebContent/src/base/components/lps/ WebContent/src/b...
Author: sebawagner
Date: Sat Jul 7 08:25:32 2012
New Revision: 1358525
URL: http://svn.apache.org/viewvc?rev=1358525&view=rev
Log:
Merge r1357715 to 2.0 branch
Removed:
incubator/openmeetings/branches/2.0/WebContent/META-INF/MANIFEST.MF
incubator/openmeetings/branches/2.0/WebContent/src/.project
Modified:
incubator/openmeetings/branches/2.0/WebContent/WEB-INF/red5-web.properties
incubator/openmeetings/branches/2.0/WebContent/WEB-INF/spring-mvc-servlet.xml
incubator/openmeetings/branches/2.0/WebContent/WEB-INF/velocity.properties
incubator/openmeetings/branches/2.0/WebContent/languages/japanese.xml
incubator/openmeetings/branches/2.0/WebContent/openmeetings/embed-compressed.js
incubator/openmeetings/branches/2.0/WebContent/openmeetings/openmeetings_functions.js
incubator/openmeetings/branches/2.0/WebContent/red5/jee-container-ssl.xml
incubator/openmeetings/branches/2.0/WebContent/red5/jee-container.xml
incubator/openmeetings/branches/2.0/WebContent/sipindex.html
incubator/openmeetings/branches/2.0/WebContent/src/base/components/lps/colorpicker.lzx
incubator/openmeetings/branches/2.0/WebContent/src/base/components/omcharts/omchartstyle.lzx
incubator/openmeetings/branches/2.0/WebContent/src/base/components/omcharts/omlegend.lzx
incubator/openmeetings/branches/2.0/WebContent/src/base/components/omcharts/ompiechart.lzx
incubator/openmeetings/branches/2.0/WebContent/src/base/components/scrollbars/om_hscrollbar.lzx
incubator/openmeetings/branches/2.0/WebContent/src/base/components/scrollbars/om_vscrollbar.lzx
incubator/openmeetings/branches/2.0/WebContent/src/embed-compressed.js
incubator/openmeetings/branches/2.0/WebContent/src/index.html
incubator/openmeetings/branches/2.0/WebContent/src/modules/conference/browser/test/conferenceBrowser_test.jsp
incubator/openmeetings/branches/2.0/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx
incubator/openmeetings/branches/2.0/WebContent/src/sipindex_debug.html
incubator/openmeetings/branches/2.0/WebContent/src/test/backup/index.jsp
incubator/openmeetings/branches/2.0/WebContent/src/test/lazslo-rtltext/rtldata.xml
incubator/openmeetings/branches/2.0/WebContent/src/test/regexp.jsp
incubator/openmeetings/branches/2.0/WebContent/src/test/test-regexp.html
incubator/openmeetings/branches/2.0/WebContent/src/test_index.html
incubator/openmeetings/branches/2.0/WebContent/swf10/base/components/explorer/resources/library.lzx
incubator/openmeetings/branches/2.0/WebContent/swf10/base/components/scrollbars/om_hscrollbar.lzx
incubator/openmeetings/branches/2.0/WebContent/swf10/base/components/scrollbars/om_vscrollbar.lzx
incubator/openmeetings/branches/2.0/build.xml
incubator/openmeetings/branches/2.0/docs/license.html
incubator/openmeetings/branches/2.0/xdocs/get-involved.xml
incubator/openmeetings/branches/2.0/xdocs/stylesheets/errortable.xsl
incubator/openmeetings/branches/2.0/xdocs/stylesheets/project.xml
Modified: incubator/openmeetings/branches/2.0/WebContent/WEB-INF/red5-web.properties
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/2.0/WebContent/WEB-INF/red5-web.properties?rev=1358525&r1=1358524&r2=1358525&view=diff
==============================================================================
--- incubator/openmeetings/branches/2.0/WebContent/WEB-INF/red5-web.properties (original)
+++ incubator/openmeetings/branches/2.0/WebContent/WEB-INF/red5-web.properties Sat Jul 7 08:25:32 2012
@@ -1 +1,17 @@
+# 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.
webapp.virtualHosts=*,localhost, 127.0.0.1
Modified: incubator/openmeetings/branches/2.0/WebContent/WEB-INF/spring-mvc-servlet.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/2.0/WebContent/WEB-INF/spring-mvc-servlet.xml?rev=1358525&r1=1358524&r2=1358525&view=diff
==============================================================================
--- incubator/openmeetings/branches/2.0/WebContent/WEB-INF/spring-mvc-servlet.xml (original)
+++ incubator/openmeetings/branches/2.0/WebContent/WEB-INF/spring-mvc-servlet.xml Sat Jul 7 08:25:32 2012
@@ -1,4 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.
+
+-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"
Modified: incubator/openmeetings/branches/2.0/WebContent/WEB-INF/velocity.properties
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/2.0/WebContent/WEB-INF/velocity.properties?rev=1358525&r1=1358524&r2=1358525&view=diff
==============================================================================
--- incubator/openmeetings/branches/2.0/WebContent/WEB-INF/velocity.properties (original)
+++ incubator/openmeetings/branches/2.0/WebContent/WEB-INF/velocity.properties Sat Jul 7 08:25:32 2012
@@ -1,3 +1,20 @@
+# 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.
+
#
# specify three resource loaders to use
#
Modified: incubator/openmeetings/branches/2.0/WebContent/languages/japanese.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/2.0/WebContent/languages/japanese.xml?rev=1358525&r1=1358524&r2=1358525&view=diff
==============================================================================
--- incubator/openmeetings/branches/2.0/WebContent/languages/japanese.xml (original)
+++ incubator/openmeetings/branches/2.0/WebContent/languages/japanese.xml Sat Jul 7 08:25:32 2012
@@ -1,5 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
+<?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.
+
+-->
<!--###############################################
This File is auto-generated by the LanguageEditor
to add new Languages or modify/customize it use the LanguageEditor
Modified: incubator/openmeetings/branches/2.0/WebContent/openmeetings/embed-compressed.js
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/2.0/WebContent/openmeetings/embed-compressed.js?rev=1358525&r1=1358524&r2=1358525&view=diff
==============================================================================
--- incubator/openmeetings/branches/2.0/WebContent/openmeetings/embed-compressed.js (original)
+++ incubator/openmeetings/branches/2.0/WebContent/openmeetings/embed-compressed.js Sat Jul 7 08:25:32 2012
@@ -1,3 +1,22 @@
+/*
+ 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.
+
+*/
var $dhtml=true;var $as3=false;var $js1=true;var $swf7=false;var $swf8=false;var $svg=false;var $as2=false;var $swf9=false;var $profile=false;var $runtime="dhtml";var $swf10=false;var $debug=false;var $j2me=false;try{
if(lz){
Modified: incubator/openmeetings/branches/2.0/WebContent/openmeetings/openmeetings_functions.js
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/2.0/WebContent/openmeetings/openmeetings_functions.js?rev=1358525&r1=1358524&r2=1358525&view=diff
==============================================================================
--- incubator/openmeetings/branches/2.0/WebContent/openmeetings/openmeetings_functions.js (original)
+++ incubator/openmeetings/branches/2.0/WebContent/openmeetings/openmeetings_functions.js Sat Jul 7 08:25:32 2012
@@ -1,4 +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.
+
+*/
+/*
* Functions to be included in the HTML wrapper,
* see the templates dir (*.vm) for the include statements
*
Modified: incubator/openmeetings/branches/2.0/WebContent/red5/jee-container-ssl.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/2.0/WebContent/red5/jee-container-ssl.xml?rev=1358525&r1=1358524&r2=1358525&view=diff
==============================================================================
--- incubator/openmeetings/branches/2.0/WebContent/red5/jee-container-ssl.xml (original)
+++ incubator/openmeetings/branches/2.0/WebContent/red5/jee-container-ssl.xml Sat Jul 7 08:25:32 2012
@@ -1,4 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.
+
+-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:lang="http://www.springframework.org/schema/lang"
Modified: incubator/openmeetings/branches/2.0/WebContent/red5/jee-container.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/2.0/WebContent/red5/jee-container.xml?rev=1358525&r1=1358524&r2=1358525&view=diff
==============================================================================
--- incubator/openmeetings/branches/2.0/WebContent/red5/jee-container.xml (original)
+++ incubator/openmeetings/branches/2.0/WebContent/red5/jee-container.xml Sat Jul 7 08:25:32 2012
@@ -1,4 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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.
+
+-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:lang="http://www.springframework.org/schema/lang"
Modified: incubator/openmeetings/branches/2.0/WebContent/sipindex.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/2.0/WebContent/sipindex.html?rev=1358525&r1=1358524&r2=1358525&view=diff
==============================================================================
--- incubator/openmeetings/branches/2.0/WebContent/sipindex.html (original)
+++ incubator/openmeetings/branches/2.0/WebContent/sipindex.html Sat Jul 7 08:25:32 2012
@@ -1,4 +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.
+
+-->
+<!--
designed to be empty
necessary for tomcat process to default-index-page
-->
\ No newline at end of file
Modified: incubator/openmeetings/branches/2.0/WebContent/src/base/components/lps/colorpicker.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/2.0/WebContent/src/base/components/lps/colorpicker.lzx?rev=1358525&r1=1358524&r2=1358525&view=diff
==============================================================================
--- incubator/openmeetings/branches/2.0/WebContent/src/base/components/lps/colorpicker.lzx (original)
+++ incubator/openmeetings/branches/2.0/WebContent/src/base/components/lps/colorpicker.lzx Sat Jul 7 08:25:32 2012
@@ -1,3 +1,23 @@
+<?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.
+
+-->
<!---
changed by swagner
-->
Modified: incubator/openmeetings/branches/2.0/WebContent/src/base/components/omcharts/omchartstyle.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/2.0/WebContent/src/base/components/omcharts/omchartstyle.lzx?rev=1358525&r1=1358524&r2=1358525&view=diff
==============================================================================
--- incubator/openmeetings/branches/2.0/WebContent/src/base/components/omcharts/omchartstyle.lzx (original)
+++ incubator/openmeetings/branches/2.0/WebContent/src/base/components/omcharts/omchartstyle.lzx Sat Jul 7 08:25:32 2012
@@ -1,3 +1,23 @@
+<?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.
+
+-->
<!---
@access public
@topic Components
Modified: incubator/openmeetings/branches/2.0/WebContent/src/base/components/omcharts/omlegend.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/2.0/WebContent/src/base/components/omcharts/omlegend.lzx?rev=1358525&r1=1358524&r2=1358525&view=diff
==============================================================================
--- incubator/openmeetings/branches/2.0/WebContent/src/base/components/omcharts/omlegend.lzx (original)
+++ incubator/openmeetings/branches/2.0/WebContent/src/base/components/omcharts/omlegend.lzx Sat Jul 7 08:25:32 2012
@@ -1,3 +1,23 @@
+<?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.
+
+-->
<!---
@access public
@topic Components
Modified: incubator/openmeetings/branches/2.0/WebContent/src/base/components/omcharts/ompiechart.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/2.0/WebContent/src/base/components/omcharts/ompiechart.lzx?rev=1358525&r1=1358524&r2=1358525&view=diff
==============================================================================
--- incubator/openmeetings/branches/2.0/WebContent/src/base/components/omcharts/ompiechart.lzx (original)
+++ incubator/openmeetings/branches/2.0/WebContent/src/base/components/omcharts/ompiechart.lzx Sat Jul 7 08:25:32 2012
@@ -1,3 +1,23 @@
+<?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.
+
+-->
<!---
@access public
@topic Components
Modified: incubator/openmeetings/branches/2.0/WebContent/src/base/components/scrollbars/om_hscrollbar.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/2.0/WebContent/src/base/components/scrollbars/om_hscrollbar.lzx?rev=1358525&r1=1358524&r2=1358525&view=diff
==============================================================================
--- incubator/openmeetings/branches/2.0/WebContent/src/base/components/scrollbars/om_hscrollbar.lzx (original)
+++ incubator/openmeetings/branches/2.0/WebContent/src/base/components/scrollbars/om_hscrollbar.lzx Sat Jul 7 08:25:32 2012
@@ -1,3 +1,23 @@
+<?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.
+
+-->
<library>
<class name="om_hscrollbar" extends="basescrollbar" styleable="false"
Modified: incubator/openmeetings/branches/2.0/WebContent/src/base/components/scrollbars/om_vscrollbar.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/2.0/WebContent/src/base/components/scrollbars/om_vscrollbar.lzx?rev=1358525&r1=1358524&r2=1358525&view=diff
==============================================================================
--- incubator/openmeetings/branches/2.0/WebContent/src/base/components/scrollbars/om_vscrollbar.lzx (original)
+++ incubator/openmeetings/branches/2.0/WebContent/src/base/components/scrollbars/om_vscrollbar.lzx Sat Jul 7 08:25:32 2012
@@ -1,3 +1,23 @@
+<?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.
+
+-->
<library>
<class name="om_vscrollbar" extends="basescrollbar" styleable="false"
Modified: incubator/openmeetings/branches/2.0/WebContent/src/embed-compressed.js
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/2.0/WebContent/src/embed-compressed.js?rev=1358525&r1=1358524&r2=1358525&view=diff
==============================================================================
--- incubator/openmeetings/branches/2.0/WebContent/src/embed-compressed.js (original)
+++ incubator/openmeetings/branches/2.0/WebContent/src/embed-compressed.js Sat Jul 7 08:25:32 2012
@@ -1,3 +1,22 @@
+/*
+ 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.
+
+*/
var $dhtml=true;var $as3=false;var $js1=true;var $swf7=false;var $swf8=false;var $svg=false;var $as2=false;var $swf9=false;var $profile=false;var $runtime="dhtml";var $swf10=false;var $debug=false;var $j2me=false;try{
if(lz){
Modified: incubator/openmeetings/branches/2.0/WebContent/src/index.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/2.0/WebContent/src/index.html?rev=1358525&r1=1358524&r2=1358525&view=diff
==============================================================================
--- incubator/openmeetings/branches/2.0/WebContent/src/index.html (original)
+++ incubator/openmeetings/branches/2.0/WebContent/src/index.html Sat Jul 7 08:25:32 2012
@@ -1,4 +1,23 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--
+ 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>
<head>
Modified: incubator/openmeetings/branches/2.0/WebContent/src/modules/conference/browser/test/conferenceBrowser_test.jsp
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/2.0/WebContent/src/modules/conference/browser/test/conferenceBrowser_test.jsp?rev=1358525&r1=1358524&r2=1358525&view=diff
==============================================================================
--- incubator/openmeetings/branches/2.0/WebContent/src/modules/conference/browser/test/conferenceBrowser_test.jsp (original)
+++ incubator/openmeetings/branches/2.0/WebContent/src/modules/conference/browser/test/conferenceBrowser_test.jsp Sat Jul 7 08:25:32 2012
@@ -1,3 +1,22 @@
+<!--
+ 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>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
Modified: incubator/openmeetings/branches/2.0/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/2.0/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx?rev=1358525&r1=1358524&r2=1358525&view=diff
==============================================================================
--- incubator/openmeetings/branches/2.0/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx (original)
+++ incubator/openmeetings/branches/2.0/WebContent/src/modules/conference/commonVideoComponentAdapter.lzx Sat Jul 7 08:25:32 2012
@@ -1,4 +1,23 @@
<?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.
+
+-->
<library>
<class name="commonVideoComponentAdapter" extends="node">
Modified: incubator/openmeetings/branches/2.0/WebContent/src/sipindex_debug.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/2.0/WebContent/src/sipindex_debug.html?rev=1358525&r1=1358524&r2=1358525&view=diff
==============================================================================
--- incubator/openmeetings/branches/2.0/WebContent/src/sipindex_debug.html (original)
+++ incubator/openmeetings/branches/2.0/WebContent/src/sipindex_debug.html Sat Jul 7 08:25:32 2012
@@ -1,4 +1,23 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--
+ 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>
<head>
Modified: incubator/openmeetings/branches/2.0/WebContent/src/test/backup/index.jsp
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/2.0/WebContent/src/test/backup/index.jsp?rev=1358525&r1=1358524&r2=1358525&view=diff
==============================================================================
--- incubator/openmeetings/branches/2.0/WebContent/src/test/backup/index.jsp (original)
+++ incubator/openmeetings/branches/2.0/WebContent/src/test/backup/index.jsp Sat Jul 7 08:25:32 2012
@@ -1,5 +1,24 @@
<%@ page language="java" contentType="text/html; charset=UTF-8"
pageEncoding="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.
+
+-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
Modified: incubator/openmeetings/branches/2.0/WebContent/src/test/lazslo-rtltext/rtldata.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/2.0/WebContent/src/test/lazslo-rtltext/rtldata.xml?rev=1358525&r1=1358524&r2=1358525&view=diff
==============================================================================
--- incubator/openmeetings/branches/2.0/WebContent/src/test/lazslo-rtltext/rtldata.xml (original)
+++ incubator/openmeetings/branches/2.0/WebContent/src/test/lazslo-rtltext/rtldata.xml Sat Jul 7 08:25:32 2012
@@ -1,3 +1,22 @@
+<!--
+ 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.
+
+-->
<!-- Persons Data -->
<dataset name="personsData">
<myXML>
Modified: incubator/openmeetings/branches/2.0/WebContent/src/test/regexp.jsp
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/2.0/WebContent/src/test/regexp.jsp?rev=1358525&r1=1358524&r2=1358525&view=diff
==============================================================================
--- incubator/openmeetings/branches/2.0/WebContent/src/test/regexp.jsp (original)
+++ incubator/openmeetings/branches/2.0/WebContent/src/test/regexp.jsp Sat Jul 7 08:25:32 2012
@@ -1,5 +1,24 @@
<%@ page language="java" contentType="text/html; charset=UTF-8"
pageEncoding="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.
+
+-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
Modified: incubator/openmeetings/branches/2.0/WebContent/src/test/test-regexp.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/2.0/WebContent/src/test/test-regexp.html?rev=1358525&r1=1358524&r2=1358525&view=diff
==============================================================================
--- incubator/openmeetings/branches/2.0/WebContent/src/test/test-regexp.html (original)
+++ incubator/openmeetings/branches/2.0/WebContent/src/test/test-regexp.html Sat Jul 7 08:25:32 2012
@@ -1,4 +1,23 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--
+ 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>
<head>
<link rel="shortcut icon" href="favicon.ico" >
Modified: incubator/openmeetings/branches/2.0/WebContent/src/test_index.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/2.0/WebContent/src/test_index.html?rev=1358525&r1=1358524&r2=1358525&view=diff
==============================================================================
--- incubator/openmeetings/branches/2.0/WebContent/src/test_index.html (original)
+++ incubator/openmeetings/branches/2.0/WebContent/src/test_index.html Sat Jul 7 08:25:32 2012
@@ -1,4 +1,23 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--
+ 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>
<head>
Modified: incubator/openmeetings/branches/2.0/WebContent/swf10/base/components/explorer/resources/library.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/2.0/WebContent/swf10/base/components/explorer/resources/library.lzx?rev=1358525&r1=1358524&r2=1358525&view=diff
==============================================================================
--- incubator/openmeetings/branches/2.0/WebContent/swf10/base/components/explorer/resources/library.lzx (original)
+++ incubator/openmeetings/branches/2.0/WebContent/swf10/base/components/explorer/resources/library.lzx Sat Jul 7 08:25:32 2012
@@ -1,4 +1,23 @@
<?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.
+
+-->
<library>
<!-- APL author sebawagner -->
Modified: incubator/openmeetings/branches/2.0/WebContent/swf10/base/components/scrollbars/om_hscrollbar.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/2.0/WebContent/swf10/base/components/scrollbars/om_hscrollbar.lzx?rev=1358525&r1=1358524&r2=1358525&view=diff
==============================================================================
--- incubator/openmeetings/branches/2.0/WebContent/swf10/base/components/scrollbars/om_hscrollbar.lzx (original)
+++ incubator/openmeetings/branches/2.0/WebContent/swf10/base/components/scrollbars/om_hscrollbar.lzx Sat Jul 7 08:25:32 2012
@@ -1,3 +1,23 @@
+<?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.
+
+-->
<library>
<class name="om_hscrollbar" extends="basescrollbar" styleable="false"
Modified: incubator/openmeetings/branches/2.0/WebContent/swf10/base/components/scrollbars/om_vscrollbar.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/2.0/WebContent/swf10/base/components/scrollbars/om_vscrollbar.lzx?rev=1358525&r1=1358524&r2=1358525&view=diff
==============================================================================
--- incubator/openmeetings/branches/2.0/WebContent/swf10/base/components/scrollbars/om_vscrollbar.lzx (original)
+++ incubator/openmeetings/branches/2.0/WebContent/swf10/base/components/scrollbars/om_vscrollbar.lzx Sat Jul 7 08:25:32 2012
@@ -1,3 +1,23 @@
+<?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.
+
+-->
<library>
<class name="om_vscrollbar" extends="basescrollbar" styleable="false"
Modified: incubator/openmeetings/branches/2.0/build.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/2.0/build.xml?rev=1358525&r1=1358524&r2=1358525&view=diff
==============================================================================
--- incubator/openmeetings/branches/2.0/build.xml (original)
+++ incubator/openmeetings/branches/2.0/build.xml Sat Jul 7 08:25:32 2012
@@ -40,6 +40,8 @@
<property name="rat.lib.dir" value="${project.lib.dir}/rat" />
<property name="dtd-generator.lib.dir" value="${project.lib.dir}/dtd-generator" />
<property name="svntask.lib.dir" value="${project.lib.dir}/svntask" />
+ <property name="docs.dest" value="docs" />
+ <property name="docs.src" value="xdocs" />
<property name="red5.server.dir" value="${build.base.dir}/red5/server" />
<property name="red5.client.dir" value="${build.base.dir}/red5/client" />
@@ -530,6 +532,8 @@
<rat:report>
<fileset dir="${main.src.dir}" />
+ <fileset dir="${webcontent.src.dir}" />
+ <fileset dir="${docs.src}" />
</rat:report>
</target>
@@ -540,8 +544,6 @@
<target name="build.webservice.doc" depends="compile.only, build.only.webservice.doc"/>
- <property name="docs.dest" value="docs" />
- <property name="docs.src" value="xdocs" />
<patternset id="images">
<include name="**/*.gif" />
<include name="**/*.jpeg" />
Modified: incubator/openmeetings/branches/2.0/docs/license.html
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/2.0/docs/license.html?rev=1358525&r1=1358524&r2=1358525&view=diff
==============================================================================
--- incubator/openmeetings/branches/2.0/docs/license.html (original)
+++ incubator/openmeetings/branches/2.0/docs/license.html Sat Jul 7 08:25:32 2012
@@ -934,213 +934,213 @@ limitations under the License.
</tr>
<tr>
<td bgcolor="#023264" width="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/></td>
- <td bgcolor="#ffffff"><pre>
-
-
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- 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.
-
-
+ <td bgcolor="#ffffff"><pre>
+
+
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ 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.
+
+
</pre></td>
<td bgcolor="#023264" width="1"><img src="/images/void.gif" width="1" height="1" vspace="0" hspace="0" border="0"/></td>
</tr>
Modified: incubator/openmeetings/branches/2.0/xdocs/get-involved.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/2.0/xdocs/get-involved.xml?rev=1358525&r1=1358524&r2=1358525&view=diff
==============================================================================
--- incubator/openmeetings/branches/2.0/xdocs/get-involved.xml (original)
+++ incubator/openmeetings/branches/2.0/xdocs/get-involved.xml Sat Jul 7 08:25:32 2012
@@ -1,5 +1,17 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-
+<!--
+ 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.
+ -->
<document>
<properties>
Modified: incubator/openmeetings/branches/2.0/xdocs/stylesheets/errortable.xsl
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/2.0/xdocs/stylesheets/errortable.xsl?rev=1358525&r1=1358524&r2=1358525&view=diff
==============================================================================
--- incubator/openmeetings/branches/2.0/xdocs/stylesheets/errortable.xsl (original)
+++ incubator/openmeetings/branches/2.0/xdocs/stylesheets/errortable.xsl Sat Jul 7 08:25:32 2012
@@ -17,7 +17,19 @@
<xsl:template match="ROOT">
<document>
+<xsl:comment>
+ 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.
+ </xsl:comment>
<properties>
<title>Openmeetings Errors table</title>
<author>Apache OpenMeetings Documentation Robot</author>
Modified: incubator/openmeetings/branches/2.0/xdocs/stylesheets/project.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/branches/2.0/xdocs/stylesheets/project.xml?rev=1358525&r1=1358524&r2=1358525&view=diff
==============================================================================
--- incubator/openmeetings/branches/2.0/xdocs/stylesheets/project.xml (original)
+++ incubator/openmeetings/branches/2.0/xdocs/stylesheets/project.xml Sat Jul 7 08:25:32 2012
@@ -1,4 +1,17 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 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.
+ -->
<project name="Apache OpenMeetings Project"
href="http://incubator.apache.org/openmeetings/">