Author: [email protected]
Date: Mon Aug 8 12:23:35 2011
New Revision: 1283
Log:
[AMDATUOPENSOCIAL-78] Upgraded assembly plugin to 2.2.1 for resource filtering,
fixed contrib and readme files
Added:
trunk/amdatu-opensocial/config/
trunk/amdatu-opensocial/config/pom.xml
trunk/amdatu-opensocial/config/src/
trunk/amdatu-opensocial/config/src/main/
trunk/amdatu-opensocial/config/src/main/resources/
trunk/amdatu-opensocial/config/src/main/resources/org.amdatu.opensocial.shindig.cfg
trunk/amdatu-opensocial/release/src/main/resources/CHANGELOG
- copied, changed from r1280,
/trunk/amdatu-opensocial/release/src/main/resources/CHANGELOG.txt
trunk/amdatu-opensocial/release/src/main/resources/LICENSE
- copied unchanged from r1280,
/trunk/amdatu-opensocial/release/src/main/resources/LICENSE.txt
trunk/amdatu-opensocial/release/src/main/resources/LICENSE-JSON
trunk/amdatu-opensocial/release/src/main/resources/LICENSE-MIT
trunk/amdatu-opensocial/release/src/main/resources/NOTICE
- copied, changed from r1280,
/trunk/amdatu-opensocial/release/src/main/resources/NOTICE.txt
trunk/amdatu-opensocial/release/src/main/resources/README
- copied, changed from r1280,
/trunk/amdatu-opensocial/release/src/main/resources/README.txt
Removed:
trunk/amdatu-opensocial/config-fileinstall/
trunk/amdatu-opensocial/release/src/main/resources/CHANGELOG.txt
trunk/amdatu-opensocial/release/src/main/resources/LICENSE.txt
trunk/amdatu-opensocial/release/src/main/resources/NOTICE.txt
trunk/amdatu-opensocial/release/src/main/resources/README.txt
Modified:
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/service/ShindigOpenSocialContainerImpl.java
trunk/amdatu-opensocial/pom.xml
trunk/amdatu-opensocial/release/pom.xml
trunk/amdatu-opensocial/release/src/main/assembly/bin-component.xml
trunk/amdatu-opensocial/release/src/main/assembly/bin-release.xml
trunk/amdatu-opensocial/release/src/main/assembly/src-release.xml
Added: trunk/amdatu-opensocial/config/pom.xml
==============================================================================
--- (empty file)
+++ trunk/amdatu-opensocial/config/pom.xml Mon Aug 8 12:23:35 2011
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2010, 2011 The Amdatu Foundation
+
+ 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.verning permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.amdatu.opensocial</groupId>
+ <artifactId>org.amdatu.opensocial</artifactId>
+ <version>0.2.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>org.amdatu.opensocial.config</artifactId>
+ <packaging>jar</packaging>
+ <name>Amdatu OpenSocial configuration files</name>
+ <description>This artifacts holds the configuration files for Amdatu
OpenSocial.</description>
+
+ <repositories>
+ <repository>
+ <id>amdatu.releases</id>
+ <name>Amdatu Release Repository</name>
+ <url>http://repository.amdatu.org/releases</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>amdatu.snapshots</id>
+ <name>Amdatu Snapshot Repository</name>
+ <url>http://repository.amdatu.org/snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>riptano</id>
+ <name>Riptano Repository</name>
+ <url>http://mvn.riptano.com/content/repositories/riptano</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+</project>
\ No newline at end of file
Added:
trunk/amdatu-opensocial/config/src/main/resources/org.amdatu.opensocial.shindig.cfg
==============================================================================
--- (empty file)
+++
trunk/amdatu-opensocial/config/src/main/resources/org.amdatu.opensocial.shindig.cfg
Mon Aug 8 12:23:35 2011
@@ -0,0 +1,157 @@
+# 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.
+
+# Location of feature manifests (comma separated)
+shindig.features.default=res://features/features.txt
+
+# Location of container configurations (comma separated)
+# NB: this property is set by
org.amdatu.opensocial.shindig.module.ConfigurationAdminGuiceModule
+shindig.containers.default=
+
+# A file containing blacklisted gadgets.
+shindig.blacklist.file=
+
+### Inbound OAuth support
+# The URL base to use for full OAuth support (three-legged)
+shindig.oauth.base-url=/oauth/
+shindig.oauth.authorize-action=/dashboard/authorize.jsp
+
+### Outbound OAuth support
+shindig.signing.state-key=
+shindig.signing.key-name=amdatu_public_key
+#shindig.signing.key-file=res://conf/oauthkey.pem
+shindig.signing.global-callback-url=http://${server.hostname}:${server.port}/gadgets/oauthcallback
+shindig.signing.enable-signed-callbacks=true
+
+# Set to true if you want to allow the use of 3-legged OAuth tokens when
viewer != owner.
+# This setting is not recommeneded for pages that allow user-controlled
javascript, since
+# that javascript could be used to make unauthorized requests on behalf of the
viewer of the page
+shindig.signing.viewer-access-tokens-enabled=false
+
+# If enabled here, configuration values can be found in container
configuration files.
+shindig.locked-domain.enabled=false
+
+# TODO: This needs to be moved to container configuration.
+shindig.content-rewrite.only-allow-excludes=false
+shindig.content-rewrite.include-urls=.*
+shindig.content-rewrite.exclude-urls=
+shindig.content-rewrite.include-tags=body,embed,img,input,link,script,style
+shindig.content-rewrite.expires=86400
+shindig.content-rewrite.proxy-url=/gadgets/proxy?container=default&url=
+shindig.content-rewrite.concat-url=/gadgets/concat?container=default&
+shindig.content-rewrite.enable-split-js-concat=true
+
+#
+# Default set of forced libs to allow for better caching
+#
+# NOTE: setting this causes the EndToEnd test to fail the opensocial-templates
test
+shindig.gadget-rewrite.default-forced-libs=core:rpc
+#shindig.gadget-rewrite.default-forced-libs=
+
+#
+# Allow supported JavaScript features required by a gadget to be externalized
on demand
+shindig.gadget-rewrite.externalize-feature-libs=false
+
+# Configuration for image rewriter
+shindig.image-rewrite.max-inmem-bytes = 1048576
+shindig.image-rewrite.max-palette-size = 256
+shindig.image-rewrite.allow-jpeg-conversion = true
+shindig.image-rewrite.jpeg-compression = 0.75
+shindig.image-rewrite.min-threshold-bytes = 200
+
+# Configuration for the os:Flash tag
+shindig.flash.min-version = 9.0.115
+
+# Configuration for template rewriter
+shindig.template-rewrite.extension-tag-namespace=http://ns.opensocial.org/2009/extensions
+
+# These values provide default TTLs for HTTP responses that don't use caching
headers.
+shindig.cache.http.defaultTtl=0
+shindig.cache.http.negativeCacheTtl=0
+
+# A default refresh interval for XML files, since there is no natural way for
developers to
+# specify this value, and most HTTP responses don't include good cache control
headers.
+# this setting (1) prevents the XML files to be cached forever, handy during
development
+shindig.cache.xml.refreshInterval=1
+
+# Add entries in the form shindig.cache.lru.<name>.capacity to specify
capacities for different
+# caches when using the LruCacheProvider.
+# It is highly recommended that the EhCache implementation be used instead of
the LRU cache.
+shindig.cache.lru.default.capacity=1000
+shindig.cache.lru.expressions.capacity=1000
+shindig.cache.lru.gadgetSpecs.capacity=1000
+shindig.cache.lru.messageBundles.capacity=1000
+shindig.cache.lru.httpResponses.capacity=10000
+
+# The location of the EhCache configuration file.
+shindig.cache.ehcache.config=res://org/apache/shindig/common/cache/ehcache/ehcacheConfig.xml
+
+# True to enable JMX integration with cache stats
+shindig.cache.ehcache.jmx.enabled=true
+
+# true to enable JMX stats.
+shindig.cache.ehcache.jmx.stats=true
+
+# true to skip expensive encoding detection.
+# if true, will only attempt to validate utf-8. Assumes all other encodings
are ISO-8859-1.
+shindig.http.fast-encoding-detection=true
+
+# Configuration for the HttpFetcher
+# Connection timeout, in milliseconds, for requests.
+shindig.http.client.connection-timeout-ms=15000
+
+# Maximum size, in bytes, of the object we fetched, 0 == no limit
+shindig.http.client.max-object-size-bytes=0
+
+# Strict-mode parsing for proxy and concat URIs ensures that the
authority/host and path
+# for the URIs match precisely what is found in the container config for it.
This is
+# useful where statistics and traffic routing patterns, typically in large
installations,
+# key on hostname (and occasionally path). Enforcing this does come at the
cost that
+# mismatches break, which in turn mandates that URI generation always happen
in consistent
+# fashion, ie. by the class itself or tightly controlled code.
+shindig.uri.proxy.use-strict-parsing=false
+shindig.uri.concat.use-strict-parsing=false
+
+# Host:port of the proxy to use while fetching urls. Leave blank if proxy is
+# not to be used.
+org.apache.shindig.gadgets.http.basicHttpFetcherProxy=
+
+org.apache.shindig.serviceExpirationDurationMinutes=60
+
+#
+# Older versions of shindig used 'data' in the json-rpc response format
+# The spec calls for using 'result' instead, however to avoid breakage we
+# allow you to set it back to the old way here
+#
+# valid values are
+# result - new form
+# data - old broken form
+# both - return both fields for full compatibility
+#
+shindig.json-rpc.result-field=result
+
+# Remap "Internal server error"s received from the basicHttpFetcherProxy
server to
+# "Bad Gateway error"s, so that it is clear to the user that the proxy server
is
+# the one that threw the exception.
+shindig.accelerate.remapInternalServerError=true
+
+shindig.host=${server.hostname}
+shindig.port=${server.port}
+
+shindig.proxy.remapInternalServerError=false
+
+workdir=work/shindig
\ No newline at end of file
Modified:
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/service/ShindigOpenSocialContainerImpl.java
==============================================================================
---
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/service/ShindigOpenSocialContainerImpl.java
(original)
+++
trunk/amdatu-opensocial/opensocial-shindig/src/main/java/org/amdatu/opensocial/shindig/service/ShindigOpenSocialContainerImpl.java
Mon Aug 8 12:23:35 2011
@@ -1,6 +1,6 @@
/*
* Copyright (c) 2010, 2011 The Amdatu Foundation
- *
+ *
* 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
@@ -33,9 +33,9 @@
import javax.servlet.http.HttpServletRequest;
-import org.amdatu.authentication.tokenprovider.InvalidTokenException;
-import org.amdatu.authentication.tokenprovider.TokenProvider;
-import org.amdatu.authentication.tokenprovider.TokenProviderException;
+import org.amdatu.auth.tokenprovider.InvalidTokenException;
+import org.amdatu.auth.tokenprovider.TokenProvider;
+import org.amdatu.auth.tokenprovider.TokenProviderException;
import org.amdatu.core.tenant.Tenant;
import org.amdatu.opensocial.gadgetmanagement.OpenSocialContainer;
import org.apache.felix.dm.Component;
@@ -54,7 +54,7 @@
/**
* Shindig implementation of the OpenSocialContainer interface.
- *
+ *
* @author ivol
*/
public class ShindigOpenSocialContainerImpl implements OpenSocialContainer {
Modified: trunk/amdatu-opensocial/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/pom.xml (original)
+++ trunk/amdatu-opensocial/pom.xml Mon Aug 8 12:23:35 2011
@@ -119,6 +119,13 @@
<scope>provided</scope>
<type>bundle</type>
</dependency>
+ <dependency>
+ <groupId>org.amdatu.opensocial</groupId>
+ <artifactId>org.amdatu.opensocial.config</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ <type>jar</type>
+ </dependency>
<!-- Dependency setup for amdatu-core project -->
<dependency>
@@ -216,12 +223,16 @@
</distributionManagement>
<modules>
+ <module>config</module>
<module>example-friends-gadget</module>
<module>example-gadgetrepository</module>
<module>opensocial-dashboard</module>
<module>opensocial-gadgetmanagement</module>
<module>opensocial-profile</module>
<module>opensocial-shindig</module>
+ <module>release</module>
+ <module>test-integration</module>
+ <module>test-performance</module>
</modules>
<build>
Modified: trunk/amdatu-opensocial/release/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/release/pom.xml (original)
+++ trunk/amdatu-opensocial/release/pom.xml Mon Aug 8 12:23:35 2011
@@ -14,6 +14,12 @@
<dependencies>
<dependency>
<groupId>org.amdatu.opensocial</groupId>
+ <artifactId>org.amdatu.opensocial.config</artifactId>
+ <scope>runtime</scope>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.opensocial</groupId>
<artifactId>org.amdatu.opensocial.dashboard</artifactId>
<scope>runtime</scope>
<type>bundle</type>
@@ -50,6 +56,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2.1</version>
<executions>
<execution>
<id>create-release</id>
Modified: trunk/amdatu-opensocial/release/src/main/assembly/bin-component.xml
==============================================================================
--- trunk/amdatu-opensocial/release/src/main/assembly/bin-component.xml
(original)
+++ trunk/amdatu-opensocial/release/src/main/assembly/bin-component.xml Mon Aug
8 12:23:35 2011
@@ -7,20 +7,34 @@
<outputDirectory>bin</outputDirectory>
<outputFileNameMapping>${artifact.groupId}.${artifact.artifactId}-${artifact.version}.${artifact.extension}</outputFileNameMapping>
<includes>
- <include>org.amdatu.opensocial:*</include>
+
<include>org.amdatu.opensocial:org.amdatu.opensocial.dashboard</include>
+
<include>org.amdatu.opensocial:org.amdatu.opensocial.gadgetmanagement</include>
+ <include>org.amdatu.opensocial:org.amdatu.opensocial.profile</include>
+ <include>org.amdatu.opensocial:org.amdatu.opensocial.shindig</include>
</includes>
<unpack>false</unpack>
<useTransitiveDependencies>false</useTransitiveDependencies>
</dependencySet>
+
+ <dependencySet>
+ <outputDirectory>conf</outputDirectory>
+ <outputFileNameMapping></outputFileNameMapping>
+ <includes>
+ <include>org.amdatu.opensocial:org.amdatu.opensocial.config</include>
+ </includes>
+ <unpack>true</unpack>
+ <unpackOptions>
+ <filtered>true</filtered>
+ <includes>
+ <include>*.cfg</include>
+ </includes>
+ </unpackOptions>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ </dependencySet>
</dependencySets>
<fileSets>
<fileSet>
- <directory>../config-fileinstall</directory>
- <outputDirectory>conf</outputDirectory>
- <filtered>true</filtered>
- </fileSet>
- <fileSet>
<directory>src/main/resources</directory>
<outputDirectory></outputDirectory>
<filtered>true</filtered>
Modified: trunk/amdatu-opensocial/release/src/main/assembly/bin-release.xml
==============================================================================
--- trunk/amdatu-opensocial/release/src/main/assembly/bin-release.xml
(original)
+++ trunk/amdatu-opensocial/release/src/main/assembly/bin-release.xml Mon Aug
8 12:23:35 2011
@@ -8,7 +8,7 @@
<format>zip</format>
</formats>
<baseDirectory>amdatu-opensocial-${project.version}</baseDirectory>
- <includeBaseDirectory>true</includeBaseDirectory> <!-- strip the module
prefixes -->
+ <includeBaseDirectory>false</includeBaseDirectory> <!-- strip the module
prefixes -->
<componentDescriptors>
<componentDescriptor>src/main/assembly/bin-component.xml</componentDescriptor>
Modified: trunk/amdatu-opensocial/release/src/main/assembly/src-release.xml
==============================================================================
--- trunk/amdatu-opensocial/release/src/main/assembly/src-release.xml
(original)
+++ trunk/amdatu-opensocial/release/src/main/assembly/src-release.xml Mon Aug
8 12:23:35 2011
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (c) 2010, 2011 The Amdatu Foundation
+
+ 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.verning permissions and limitations
+ under the License.
+-->
<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0
http://maven.apache.org/xsd/assembly-1.1.0.xsd";>
@@ -7,25 +23,23 @@
<format>tar.gz</format>
<format>zip</format>
</formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
- <sources>
- <outputDirectory>src</outputDirectory>
- <fileSets>
- <fileSet>
- <directory>..</directory>
- <outputDirectory>src</outputDirectory>
- <excludes>
- <exclude>**/target/**</exclude>
- <exclude>**/.settings/**</exclude>
- <exclude>**/.classpath</exclude>
- <exclude>**/.project</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>src/main/resources</directory>
- <outputDirectory></outputDirectory>
- </fileSet>
- </fileSets>
- </sources>
+ <fileSets>
+ <fileSet>
+ <directory>..</directory>
+ <outputDirectory>src</outputDirectory>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ <exclude>**/.settings/**</exclude>
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/resources</directory>
+ <outputDirectory></outputDirectory>
+ </fileSet>
+ </fileSets>
</assembly>
\ No newline at end of file
Copied: trunk/amdatu-opensocial/release/src/main/resources/CHANGELOG (from
r1280, /trunk/amdatu-opensocial/release/src/main/resources/CHANGELOG.txt)
==============================================================================
--- /trunk/amdatu-opensocial/release/src/main/resources/CHANGELOG.txt
(original)
+++ trunk/amdatu-opensocial/release/src/main/resources/CHANGELOG Mon Aug
8 12:23:35 2011
@@ -4,7 +4,7 @@
Amdatu OpenSocial
Release 0.2.0
-Last revised April 27, 2011
+Last revised August 8, 2011
---------------------------
The changelog below is automatically generated from JIRA. More information
about the resolved
Added: trunk/amdatu-opensocial/release/src/main/resources/LICENSE-JSON
==============================================================================
--- (empty file)
+++ trunk/amdatu-opensocial/release/src/main/resources/LICENSE-JSON Mon Aug
8 12:23:35 2011
@@ -0,0 +1,18 @@
+Copyright (c) 2002 JSON.org
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
of this software
+and associated documentation files (the "Software"), to deal in the Software
without restriction,
+including without limitation the rights to use, copy, modify, merge, publish,
distribute,
+sublicense, and/or sell copies of the Software, and to permit persons to whom
the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
copies or
+substantial portions of the Software.
+
+The Software shall be used for Good, not Evil.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING
+BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
\ No newline at end of file
Added: trunk/amdatu-opensocial/release/src/main/resources/LICENSE-MIT
==============================================================================
--- (empty file)
+++ trunk/amdatu-opensocial/release/src/main/resources/LICENSE-MIT Mon Aug
8 12:23:35 2011
@@ -0,0 +1,21 @@
+ Copyright (c) 2004-2008 QOS.ch
+ All rights reserved.
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
Copied: trunk/amdatu-opensocial/release/src/main/resources/NOTICE (from r1280,
/trunk/amdatu-opensocial/release/src/main/resources/NOTICE.txt)
==============================================================================
--- /trunk/amdatu-opensocial/release/src/main/resources/NOTICE.txt
(original)
+++ trunk/amdatu-opensocial/release/src/main/resources/NOTICE Mon Aug 8
12:23:35 2011
@@ -1,24 +1,24 @@
This product includes Amdatu OpenSocial, developed by The Amdatu Foundation
(http://www.amdatu.org/).
Copyright 2011 The Amdatu Foundation.
For more information, see
http://www.amdatu.org/confluence/display/Amdatu/Amdatu+OpenSocial.
-License: Apache Software License 2.0 (see LICENSE-ASL2.txt).
+License: Apache Software License 2.0 (see LICENSE).
-
This product includes JSON in JAVA, developed by JSON.org
(http://www.json.org).
Copyright 2002 JSON.org
For more information, see http://www.json.org/.
-License: JSON (see LICENSE-JSON.txt)
+License: JSON (see LICENSE-JSON)
-
This product includes Apache Shindig, developed by The Apache Software
Foundation.
Copyright 2010 The Apache Software Foundation.
For more information, see http://shindig.apache.org/.
-License: Apache Software License 2.0 (see LICENSE-ASL2.txt).
+License: Apache Software License 2.0 (see LICENSE).
-
This product includes Apache SLF4J, developed by Ceki G�lc�.
Copyright 2004-2005 SLF4J.ORG.
For more information, see http://www.slf4j.org/.
-License: MIT License (see LICENSE-MIT.txt).
+License: MIT License (see LICENSE-MIT).
-
This product includes commons logging, developed by The Apache Software
Foundation (http://www.apache.org/).
Copyright 2003-2007 The Apache Software Foundation.
For more information, see http://commons.apache.org/logging/.
-License: Apache Software License 2.0 (see LICENSE-ASL2.txt).
+License: Apache Software License 2.0 (see LICENSE).
Copied: trunk/amdatu-opensocial/release/src/main/resources/README (from r1280,
/trunk/amdatu-opensocial/release/src/main/resources/README.txt)
==============================================================================
--- /trunk/amdatu-opensocial/release/src/main/resources/README.txt
(original)
+++ trunk/amdatu-opensocial/release/src/main/resources/README Mon Aug 8
12:23:35 2011
@@ -5,8 +5,8 @@
Amdatu OpenSocial
Release 0.2.0
-Last revised April 27, 2011
-------------------------------
+Last revised August 8, 2011
+---------------------------
===================================================================================================
CONTENTS
@@ -24,16 +24,19 @@
===================================================================================================
-1- LICENSE AND COPYRIGHT
===================================================================================================
-Amdatu is free software: you can redistribute it and/or modify it under the
terms of the GNU
-General Public License as published by the Free Software Foundation, either
version 3 of the
-License, or (at your option) any later version.
-
-Amdatu is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even
-the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General
-Public License for more details.
+ Copyright (c) 2011 The Amdatu Foundation
-You should have received a copy of the GNU General Public License along with
This WCB. If not,
-see <http://www.gnu.org/licenses/>.
+ 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.
===================================================================================================
-2- INTRODUCTION
@@ -44,32 +47,49 @@
service fabric and foundation services provide persistence, authorization &
authentication,
scalability, provisioning, serviceability, manageability, integration,
compliance and much more.
+Amdatu OpenSocial is a subproject of Amdatu that brings OpenSocial features to
the Amdatu platform,
+based on Apache Shindig.
+
+More information can be found on
http://www.amdatu.org/confluence/display/Amdatu/Amdatu+OpenSocial.
+
===================================================================================================
-3- NEW FEATURES IN THIS RELEASE
===================================================================================================
-See CHANGELOG.txt.
+As of 0.2.0, Amdatu OpenSocial is released individually from the Amdatu
platform. Another important
+change is the license under which Amdatu OpenSocial is released; it was
changed from GPL to the
+Apache Software License 2.0.
+Important changes and new features are summarized on the WIKI page, see
+http://www.amdatu.org/confluence/display/Amdatu/OS+-+Release+notes
+
+A detailed list of all resolved JIRA issues in this version and previous
versions can be found in
+the CHANGELOG located in this directory.
===================================================================================================
-4- HARDWARE AND SOFTWARE REQUIREMENTS
===================================================================================================
-- JDK or JRE 1.5 or higher
+- Java Runtime: JDK or JRE 1.5 or higher
+- Operating system: No minimum requirement
+- Memory/disk/CPU: No minimum requirement
===================================================================================================
-5- INSTALLATION
===================================================================================================
-See http://amdatu.org/confluence/display/Amdatu/Getting+started.
+Amdatu OpenSocial consists of a set of software components that append certain
functionality to the
+Amdatu Platform. Each component is wrapped by an OSGi bundle, deployable in
the Amdatu Platform
+(or in fact, any OSGi container).
+As such, to install the software components, deploy the OSGi bundles in the
OSGi container.
===================================================================================================
-6- ISSUES
===================================================================================================
-See http://jira.amdatu.org
+See http://jira.amdatu.org/jira/secure/Dashboard.jspa?selectPageId=10022
===================================================================================================
-7- PROJECT INFORMATION
===================================================================================================
-See http://repository.amdatu.org/sites/
+See http://repository.amdatu.org/sites/opensocial/
===================================================================================================
-8- MORE INFORMATION
===================================================================================================
-See http://amdatu.org/confluence
+See http://www.amdatu.org/confluence/display/Amdatu/Amdatu+OpenSocial
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
