You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by mp...@apache.org on 2012/01/30 15:53:15 UTC
svn commit: r1237690 - in /incubator/rave/donations/ogce-gadget-container:
./ config/ config/shindig-1.1-BETA5/
ishindig-webapp/src/main/java/cgl/shindig/layoutmanager/servlet/
ishindig-webapp/src/main/java/cgl/shindig/usermanage/servlet/
ishindig-weba...
Author: mpierce
Date: Mon Jan 30 14:53:14 2012
New Revision: 1237690
URL: http://svn.apache.org/viewvc?rev=1237690&view=rev
Log:
(RAVE-449) Adding required Apache license headers and removing third party archives, replacing with instructions for obtaining.
Added:
incubator/rave/donations/ogce-gadget-container/README
incubator/rave/donations/ogce-gadget-container/portal_deploy/README
Removed:
incubator/rave/donations/ogce-gadget-container/ACKNOWLEDGMENTS
incubator/rave/donations/ogce-gadget-container/ishindig-webapp/src/main/java/cgl/shindig/layoutmanager/servlet/from_shindig.tar.gz
incubator/rave/donations/ogce-gadget-container/portal_deploy/apache-tomcat-6.0.20.tar.gz
incubator/rave/donations/ogce-gadget-container/svn-commit.tmp
Modified:
incubator/rave/donations/ogce-gadget-container/UserDB.sql
incubator/rave/donations/ogce-gadget-container/config/local.properties.template
incubator/rave/donations/ogce-gadget-container/config/shindig-1.1-BETA5/container.js.https
incubator/rave/donations/ogce-gadget-container/config/site.properties.template
incubator/rave/donations/ogce-gadget-container/ishindig-webapp/src/main/java/cgl/shindig/usermanage/servlet/defaultLayout.json
incubator/rave/donations/ogce-gadget-container/ishindig-webapp/src/main/webapp/index.jsp
incubator/rave/donations/ogce-gadget-container/ishindig-webapp/src/main/webapp/www/data-format.txt
incubator/rave/donations/ogce-gadget-container/ishindig-webapp/src/main/webapp/www/footer.html.part
incubator/rave/donations/ogce-gadget-container/ishindig-webapp/src/main/webapp/www/sign.jsp
incubator/rave/donations/ogce-gadget-container/ishindig-webapp/src/main/webapp/www/signinup.html.part
incubator/rave/donations/ogce-gadget-container/ishindig-webapp/src/main/webapp/www/userinfo.jsp
incubator/rave/donations/ogce-gadget-container/shutdown-tomcat.sh.raw
incubator/rave/donations/ogce-gadget-container/startup-tomcat.sh.raw
incubator/rave/donations/ogce-gadget-container/tomcat-config/jaas.conf
Added: incubator/rave/donations/ogce-gadget-container/README
URL: http://svn.apache.org/viewvc/incubator/rave/donations/ogce-gadget-container/README?rev=1237690&view=auto
==============================================================================
--- incubator/rave/donations/ogce-gadget-container/README (added)
+++ incubator/rave/donations/ogce-gadget-container/README Mon Jan 30 14:53:14 2012
@@ -0,0 +1,15 @@
+Apache Rave
+Copyright 2011-2012 The Apache Software Foundation
+
+The OGCE Gadget Container was originally developed by the Open Gateways Computing Environment
+project through grants from the National Science Foundation. For additional information, see
+the OGCE Web Site:
+
+ http://www.collab-ogce.org.
+
+For a complete history of commits and contributions, please see the OGCE's SourceForge SVN:
+
+ http://ogce.svn.sourceforge.net/viewvc/ogce/ShindigOGCE/ishindig-trunk/
+
+
+
Modified: incubator/rave/donations/ogce-gadget-container/UserDB.sql
URL: http://svn.apache.org/viewvc/incubator/rave/donations/ogce-gadget-container/UserDB.sql?rev=1237690&r1=1237689&r2=1237690&view=diff
==============================================================================
--- incubator/rave/donations/ogce-gadget-container/UserDB.sql (original)
+++ incubator/rave/donations/ogce-gadget-container/UserDB.sql Mon Jan 30 14:53:14 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.
+
create database if not exists hibernate;
USE hibernate;
Modified: incubator/rave/donations/ogce-gadget-container/config/local.properties.template
URL: http://svn.apache.org/viewvc/incubator/rave/donations/ogce-gadget-container/config/local.properties.template?rev=1237690&r1=1237689&r2=1237690&view=diff
==============================================================================
--- incubator/rave/donations/ogce-gadget-container/config/local.properties.template (original)
+++ incubator/rave/donations/ogce-gadget-container/config/local.properties.template Mon Jan 30 14:53:14 2012
@@ -0,0 +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.
+#
+#
Modified: incubator/rave/donations/ogce-gadget-container/config/shindig-1.1-BETA5/container.js.https
URL: http://svn.apache.org/viewvc/incubator/rave/donations/ogce-gadget-container/config/shindig-1.1-BETA5/container.js.https?rev=1237690&r1=1237689&r2=1237690&view=diff
==============================================================================
--- incubator/rave/donations/ogce-gadget-container/config/shindig-1.1-BETA5/container.js.https (original)
+++ incubator/rave/donations/ogce-gadget-container/config/shindig-1.1-BETA5/container.js.https Mon Jan 30 14:53:14 2012
@@ -55,6 +55,7 @@
"gadgets.parent" : null,
// Should all gadgets be forced on to a locked domain?
+
"gadgets.lockedDomainRequired" : false,
// DNS domain on which gadgets should render.
Modified: incubator/rave/donations/ogce-gadget-container/config/site.properties.template
URL: http://svn.apache.org/viewvc/incubator/rave/donations/ogce-gadget-container/config/site.properties.template?rev=1237690&r1=1237689&r2=1237690&view=diff
==============================================================================
--- incubator/rave/donations/ogce-gadget-container/config/site.properties.template (original)
+++ incubator/rave/donations/ogce-gadget-container/config/site.properties.template Mon Jan 30 14:53:14 2012
@@ -1 +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.
+#
+#
portal.server.ip=localhost
Modified: incubator/rave/donations/ogce-gadget-container/ishindig-webapp/src/main/java/cgl/shindig/usermanage/servlet/defaultLayout.json
URL: http://svn.apache.org/viewvc/incubator/rave/donations/ogce-gadget-container/ishindig-webapp/src/main/java/cgl/shindig/usermanage/servlet/defaultLayout.json?rev=1237690&r1=1237689&r2=1237690&view=diff
==============================================================================
--- incubator/rave/donations/ogce-gadget-container/ishindig-webapp/src/main/java/cgl/shindig/usermanage/servlet/defaultLayout.json (original)
+++ incubator/rave/donations/ogce-gadget-container/ishindig-webapp/src/main/java/cgl/shindig/usermanage/servlet/defaultLayout.json Mon Jan 30 14:53:14 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.
+ */
+
{
"layouts":[{
"layouttype":"js-tab-layout",
Modified: incubator/rave/donations/ogce-gadget-container/ishindig-webapp/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/incubator/rave/donations/ogce-gadget-container/ishindig-webapp/src/main/webapp/index.jsp?rev=1237690&r1=1237689&r2=1237690&view=diff
==============================================================================
--- incubator/rave/donations/ogce-gadget-container/ishindig-webapp/src/main/webapp/index.jsp (original)
+++ incubator/rave/donations/ogce-gadget-container/ishindig-webapp/src/main/webapp/index.jsp Mon Jan 30 14:53:14 2012
@@ -1,4 +1,25 @@
<?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?>
+<!--
+
+ 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.
+
+-->
+
<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
xmlns:c="http://java.sun.com/jsp/jstl/core">
<jsp:directive.page contentType="text/html;charset=utf-8"/>
Modified: incubator/rave/donations/ogce-gadget-container/ishindig-webapp/src/main/webapp/www/data-format.txt
URL: http://svn.apache.org/viewvc/incubator/rave/donations/ogce-gadget-container/ishindig-webapp/src/main/webapp/www/data-format.txt?rev=1237690&r1=1237689&r2=1237690&view=diff
==============================================================================
--- incubator/rave/donations/ogce-gadget-container/ishindig-webapp/src/main/webapp/www/data-format.txt (original)
+++ incubator/rave/donations/ogce-gadget-container/ishindig-webapp/src/main/webapp/www/data-format.txt Mon Jan 30 14:53:14 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.
+ */
/**
* http://www.labpixies.com/campaigns/todo/todo.xml
Modified: incubator/rave/donations/ogce-gadget-container/ishindig-webapp/src/main/webapp/www/footer.html.part
URL: http://svn.apache.org/viewvc/incubator/rave/donations/ogce-gadget-container/ishindig-webapp/src/main/webapp/www/footer.html.part?rev=1237690&r1=1237689&r2=1237690&view=diff
==============================================================================
--- incubator/rave/donations/ogce-gadget-container/ishindig-webapp/src/main/webapp/www/footer.html.part (original)
+++ incubator/rave/donations/ogce-gadget-container/ishindig-webapp/src/main/webapp/www/footer.html.part Mon Jan 30 14:53:14 2012
@@ -1,3 +1,24 @@
+<!--
+
+ 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.
+
+-->
+
<div id="footer" style="float:right;">
<a href="http://www.collab-ogce.org"">Open Grid Computing Environments</a>
</div>
Modified: incubator/rave/donations/ogce-gadget-container/ishindig-webapp/src/main/webapp/www/sign.jsp
URL: http://svn.apache.org/viewvc/incubator/rave/donations/ogce-gadget-container/ishindig-webapp/src/main/webapp/www/sign.jsp?rev=1237690&r1=1237689&r2=1237690&view=diff
==============================================================================
--- incubator/rave/donations/ogce-gadget-container/ishindig-webapp/src/main/webapp/www/sign.jsp (original)
+++ incubator/rave/donations/ogce-gadget-container/ishindig-webapp/src/main/webapp/www/sign.jsp Mon Jan 30 14:53:14 2012
@@ -1,4 +1,25 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.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/rave/donations/ogce-gadget-container/ishindig-webapp/src/main/webapp/www/signinup.html.part
URL: http://svn.apache.org/viewvc/incubator/rave/donations/ogce-gadget-container/ishindig-webapp/src/main/webapp/www/signinup.html.part?rev=1237690&r1=1237689&r2=1237690&view=diff
==============================================================================
--- incubator/rave/donations/ogce-gadget-container/ishindig-webapp/src/main/webapp/www/signinup.html.part (original)
+++ incubator/rave/donations/ogce-gadget-container/ishindig-webapp/src/main/webapp/www/signinup.html.part Mon Jan 30 14:53:14 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.
+
+-->
<!--
This page contains the sign-in and sign-up forms. It is loaded by sign.jsp.
-->
Modified: incubator/rave/donations/ogce-gadget-container/ishindig-webapp/src/main/webapp/www/userinfo.jsp
URL: http://svn.apache.org/viewvc/incubator/rave/donations/ogce-gadget-container/ishindig-webapp/src/main/webapp/www/userinfo.jsp?rev=1237690&r1=1237689&r2=1237690&view=diff
==============================================================================
--- incubator/rave/donations/ogce-gadget-container/ishindig-webapp/src/main/webapp/www/userinfo.jsp (original)
+++ incubator/rave/donations/ogce-gadget-container/ishindig-webapp/src/main/webapp/www/userinfo.jsp Mon Jan 30 14:53:14 2012
@@ -1,4 +1,25 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.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>
<jsp:directive.page import="cgl.shindig.usermanage.User"/>
Added: incubator/rave/donations/ogce-gadget-container/portal_deploy/README
URL: http://svn.apache.org/viewvc/incubator/rave/donations/ogce-gadget-container/portal_deploy/README?rev=1237690&view=auto
==============================================================================
--- incubator/rave/donations/ogce-gadget-container/portal_deploy/README (added)
+++ incubator/rave/donations/ogce-gadget-container/portal_deploy/README Mon Jan 30 14:53:14 2012
@@ -0,0 +1,2 @@
+Apache Tomcat in .tar.gz format is required to be placed in this directory in order to build properly. The specific version is set by the property portal.tomcat.version in the top level POM. The tested version is 6.0.20; other versions may not work without modification.
+
Modified: incubator/rave/donations/ogce-gadget-container/shutdown-tomcat.sh.raw
URL: http://svn.apache.org/viewvc/incubator/rave/donations/ogce-gadget-container/shutdown-tomcat.sh.raw?rev=1237690&r1=1237689&r2=1237690&view=diff
==============================================================================
--- incubator/rave/donations/ogce-gadget-container/shutdown-tomcat.sh.raw (original)
+++ incubator/rave/donations/ogce-gadget-container/shutdown-tomcat.sh.raw Mon Jan 30 14:53:14 2012
@@ -1,4 +1,24 @@
#!/bin/bash
+#
+#
+# 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.
+#
+#
# SHUTDOWN TOMCAT
echo "####################################"
Modified: incubator/rave/donations/ogce-gadget-container/startup-tomcat.sh.raw
URL: http://svn.apache.org/viewvc/incubator/rave/donations/ogce-gadget-container/startup-tomcat.sh.raw?rev=1237690&r1=1237689&r2=1237690&view=diff
==============================================================================
--- incubator/rave/donations/ogce-gadget-container/startup-tomcat.sh.raw (original)
+++ incubator/rave/donations/ogce-gadget-container/startup-tomcat.sh.raw Mon Jan 30 14:53:14 2012
@@ -1,4 +1,24 @@
#!/bin/bash
+#
+#
+# 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.
+#
+#
unset DISPLAY
unset CATALINA_HOME
Modified: incubator/rave/donations/ogce-gadget-container/tomcat-config/jaas.conf
URL: http://svn.apache.org/viewvc/incubator/rave/donations/ogce-gadget-container/tomcat-config/jaas.conf?rev=1237690&r1=1237689&r2=1237690&view=diff
==============================================================================
--- incubator/rave/donations/ogce-gadget-container/tomcat-config/jaas.conf (original)
+++ incubator/rave/donations/ogce-gadget-container/tomcat-config/jaas.conf Mon Jan 30 14:53:14 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.
+#
CertBasedCustomLogin {
cgl.shindig.security.CertBasedLoginModule