You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by li...@apache.org on 2010/09/07 10:44:03 UTC
svn commit: r993279 - in /shindig/branches/2.0.x: ./
java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/
java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/
java/social-api/src/test/java/org/apache/shindig/so...
Author: lindner
Date: Tue Sep 7 08:44:03 2010
New Revision: 993279
URL: http://svn.apache.org/viewvc?rev=993279&view=rev
Log:
merge license fix
Modified:
shindig/branches/2.0.x/ (props changed)
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MediaItemHandler.java
shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/MediaItemService.java
shindig/branches/2.0.x/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AlbumHandlerTest.java
shindig/branches/2.0.x/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/MediaItemHandlerTest.java
shindig/branches/2.0.x/pom.xml
Propchange: shindig/branches/2.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 7 08:44:03 2010
@@ -1 +1 @@
-/shindig/trunk:983949-993262
+/shindig/trunk:983949-993278
Modified: shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MediaItemHandler.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MediaItemHandler.java?rev=993279&r1=993278&r2=993279&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MediaItemHandler.java (original)
+++ shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/service/MediaItemHandler.java Tue Sep 7 08:44:03 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.social.opensocial.service;
import java.util.List;
Modified: shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/MediaItemService.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/MediaItemService.java?rev=993279&r1=993278&r2=993279&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/MediaItemService.java (original)
+++ shindig/branches/2.0.x/java/social-api/src/main/java/org/apache/shindig/social/opensocial/spi/MediaItemService.java Tue Sep 7 08:44:03 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.social.opensocial.spi;
import java.util.Set;
Modified: shindig/branches/2.0.x/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AlbumHandlerTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AlbumHandlerTest.java?rev=993279&r1=993278&r2=993279&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AlbumHandlerTest.java (original)
+++ shindig/branches/2.0.x/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/AlbumHandlerTest.java Tue Sep 7 08:44:03 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.social.opensocial.service;
import com.google.common.collect.ImmutableSet;
Modified: shindig/branches/2.0.x/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/MediaItemHandlerTest.java
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/MediaItemHandlerTest.java?rev=993279&r1=993278&r2=993279&view=diff
==============================================================================
--- shindig/branches/2.0.x/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/MediaItemHandlerTest.java (original)
+++ shindig/branches/2.0.x/java/social-api/src/test/java/org/apache/shindig/social/opensocial/service/MediaItemHandlerTest.java Tue Sep 7 08:44:03 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.social.opensocial.service;
import com.google.common.collect.ImmutableSet;
Modified: shindig/branches/2.0.x/pom.xml
URL: http://svn.apache.org/viewvc/shindig/branches/2.0.x/pom.xml?rev=993279&r1=993278&r2=993279&view=diff
==============================================================================
--- shindig/branches/2.0.x/pom.xml (original)
+++ shindig/branches/2.0.x/pom.xml Tue Sep 7 08:44:03 2010
@@ -712,6 +712,7 @@
<exclude>php/test/misc/rewriter*.js</exclude>
<exclude>php/test/misc/*.html</exclude>
<exclude>php/test/misc/*.xml</exclude>
+ <exclude>php/test/certs/*</exclude>
<exclude>BUILD-JAVA</exclude>
<exclude>COMMITTERS</exclude>
<exclude>UPGRADING</exclude>