Author: lindner
Date: Tue Aug 10 12:24:22 2010
New Revision: 983957
URL: http://svn.apache.org/viewvc?rev=983957&view=rev
Log:
merge trunk r983932 through r983955 into 2.0.x
Modified:
shindig/branches/2.0.x/ (props changed)
shindig/branches/2.0.x/content/container/payment-processor.html
shindig/branches/2.0.x/content/container/payment-records-processor.html
shindig/branches/2.0.x/content/container/sample-payment-container.html
shindig/branches/2.0.x/content/container/sample-payment.xml
shindig/branches/2.0.x/content/samplecontainer/examples/ActivityStreams/ActivityStreamsRender.js
shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/core/model/ActionLinkImpl.java
shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/core/model/MediaLinkImpl.java
shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/ActionLink.java
shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/MediaLink.java
shindig/branches/2.0.x/php/src/common/RemoteContentRequest.php
shindig/branches/2.0.x/pom.xml
Propchange: shindig/branches/2.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Aug 10 12:24:22 2010
@@ -1 +1 @@
-/shindig/trunk:945873-983931
+/shindig/trunk:945873-983955
Modified: shindig/branches/2.0.x/content/container/payment-processor.html
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/content/container/payment-processor.html?rev=983957&r1=983956&r2=983957&view=diff
==============================================================================
--- shindig/branches/2.0.x/content/container/payment-processor.html (original)
+++ shindig/branches/2.0.x/content/container/payment-processor.html Tue Aug 10
12:24:22 2010
@@ -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.
+-->
<!DOCTYPE html>
<html>
<head>
Modified:
shindig/branches/2.0.x/content/container/payment-records-processor.html
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/content/container/payment-records-processor.html?rev=983957&r1=983956&r2=983957&view=diff
==============================================================================
--- shindig/branches/2.0.x/content/container/payment-records-processor.html
(original)
+++ shindig/branches/2.0.x/content/container/payment-records-processor.html Tue
Aug 10 12:24:22 2010
@@ -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.
+-->
<!DOCTYPE html>
<html>
<head>
Modified: shindig/branches/2.0.x/content/container/sample-payment-container.html
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/content/container/sample-payment-container.html?rev=983957&r1=983956&r2=983957&view=diff
==============================================================================
--- shindig/branches/2.0.x/content/container/sample-payment-container.html
(original)
+++ shindig/branches/2.0.x/content/container/sample-payment-container.html Tue
Aug 10 12:24:22 2010
@@ -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.
+-->
<!DOCTYPE html>
<html>
<head>
Modified: shindig/branches/2.0.x/content/container/sample-payment.xml
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/content/container/sample-payment.xml?rev=983957&r1=983956&r2=983957&view=diff
==============================================================================
--- shindig/branches/2.0.x/content/container/sample-payment.xml (original)
+++ shindig/branches/2.0.x/content/container/sample-payment.xml Tue Aug 10
12:24:22 2010
@@ -1,4 +1,22 @@
<?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.
+-->
<Module>
<ModulePrefs title="My App Test"
author_email="[email protected]" height="500">
Modified:
shindig/branches/2.0.x/content/samplecontainer/examples/ActivityStreams/ActivityStreamsRender.js
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/content/samplecontainer/examples/ActivityStreams/ActivityStreamsRender.js?rev=983957&r1=983956&r2=983957&view=diff
==============================================================================
---
shindig/branches/2.0.x/content/samplecontainer/examples/ActivityStreams/ActivityStreamsRender.js
(original)
+++
shindig/branches/2.0.x/content/samplecontainer/examples/ActivityStreams/ActivityStreamsRender.js
Tue Aug 10 12:24:22 2010
@@ -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.
+ */
+
function ActivityStreamsRender() {
// Private member that wraps the OpenSocial API
Modified:
shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/core/model/ActionLinkImpl.java
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/core/model/ActionLinkImpl.java?rev=983957&r1=983956&r2=983957&view=diff
==============================================================================
---
shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/core/model/ActionLinkImpl.java
(original)
+++
shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/core/model/ActionLinkImpl.java
Tue Aug 10 12:24:22 2010
@@ -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.
+ */
package org.apache.shindig.extras.as.core.model;
import org.apache.shindig.extras.as.opensocial.model.ActionLink;
Modified:
shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/core/model/MediaLinkImpl.java
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/core/model/MediaLinkImpl.java?rev=983957&r1=983956&r2=983957&view=diff
==============================================================================
---
shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/core/model/MediaLinkImpl.java
(original)
+++
shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/core/model/MediaLinkImpl.java
Tue Aug 10 12:24:22 2010
@@ -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.
+ */
package org.apache.shindig.extras.as.core.model;
import org.apache.shindig.extras.as.opensocial.model.MediaLink;
Modified:
shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/ActionLink.java
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/ActionLink.java?rev=983957&r1=983956&r2=983957&view=diff
==============================================================================
---
shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/ActionLink.java
(original)
+++
shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/ActionLink.java
Tue Aug 10 12:24:22 2010
@@ -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.
+ */
package org.apache.shindig.extras.as.opensocial.model;
import org.apache.shindig.protocol.model.Exportablebean;
Modified:
shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/MediaLink.java
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/MediaLink.java?rev=983957&r1=983956&r2=983957&view=diff
==============================================================================
---
shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/MediaLink.java
(original)
+++
shindig/branches/2.0.x/extras/src/main/java/org/apache/shindig/extras/as/opensocial/model/MediaLink.java
Tue Aug 10 12:24:22 2010
@@ -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.
+ */
package org.apache.shindig.extras.as.opensocial.model;
import org.apache.shindig.protocol.model.Exportablebean;
Modified: shindig/branches/2.0.x/php/src/common/RemoteContentRequest.php
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/php/src/common/RemoteContentRequest.php?rev=983957&r1=983956&r2=983957&view=diff
==============================================================================
--- shindig/branches/2.0.x/php/src/common/RemoteContentRequest.php (original)
+++ shindig/branches/2.0.x/php/src/common/RemoteContentRequest.php Tue Aug 10
12:24:22 2010
@@ -381,29 +381,29 @@ class RemoteContentRequest {
return false;
}
-/**
- * transforms a possible relative url to a absolute url from the gadget xml
root
- * @param string $url
- * @param string $gadgetUrl
- * @return mixed url or false
- */
-public static function transformRelativeUrl($url, $gadgetUrl)
-{
- $parsedUri = parse_url($url);
- if (empty($parsedUri['host'])) {
- // relative path's in the locale spec uri
- // check against valid chars so that we can make sure that the given
- // relative url is valid and does not try to fetch files outside of
- // gadget scope (e.g. /../../../usr/bin... )
- $pattern =
'%^(([a-zA-Z0-9\-_](?<!\.)){1,2}([a-zA-Z0-9\.\-_](?<!\.\.))*/?)+$%';
- if (preg_match($pattern, $url)) {
- $gadgetUrl = substr($gadgetUrl, 0, strrpos($gadgetUrl, '/') + 1);
- $url = $gadgetUrl . str_replace('..', '', $url);
- } else {
- return false;
+ /**
+ * transforms a possible relative url to a absolute url from the gadget xml
root
+ * @param string $url
+ * @param string $gadgetUrl
+ * @return mixed url or false
+ */
+ public static function transformRelativeUrl($url, $gadgetUrl) {
+ $parsedUri = parse_url($url);
+ if (empty($parsedUri['host'])) {
+ // relative path's in the locale spec uri
+ // check against valid chars so that we can make sure that the given
+ // relative url is valid and does not try to fetch files outside of
+ // gadget scope (e.g. /../../../usr/bin... )
+ $pattern =
'%^(([a-zA-Z0-9\-_](?<!\.)){1,2}([a-zA-Z0-9\.\-_](?<!\.\.))*/?)+$%';
+ if (preg_match($pattern, $url)) {
+ $gadgetUrl = substr($gadgetUrl, 0, strrpos($gadgetUrl, '/') + 1);
+ $url = $gadgetUrl . str_replace('..', '', $url);
+ } else {
+ return false;
+ }
}
+ return $url;
}
- return $url;
}
Modified: shindig/branches/2.0.x/pom.xml
URL:
http://svn.apache.org/viewvc/shindig/branches/2.0.x/pom.xml?rev=983957&r1=983956&r2=983957&view=diff
==============================================================================
--- shindig/branches/2.0.x/pom.xml (original)
+++ shindig/branches/2.0.x/pom.xml Tue Aug 10 12:24:22 2010
@@ -667,7 +667,7 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.6</version>
+ <version>0.7</version>
<configuration>
<excludeSubProjects>false</excludeSubProjects>
<excludes>
@@ -1119,7 +1119,7 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.6</version>
+ <version>0.7</version>
<configuration>
<excludeSubProjects>false</excludeSubProjects>
<excludes>
