Skip to content
This repository has been archived by the owner on Mar 25, 2024. It is now read-only.

Commit

Permalink
SHINDIG-1098
Browse files Browse the repository at this point in the history
Remainder of the branch merges from 1.0.x for the release process.

git-svn-id: https://svn.apache.org/repos/asf/incubator/shindig/trunk@787591 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
ieb committed Jun 23, 2009
1 parent 19aa616 commit e9732b7
Show file tree
Hide file tree
Showing 17 changed files with 1,333 additions and 151 deletions.
49 changes: 49 additions & 0 deletions KEYS
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
pub 1024D/40E47E14 2008-07-19 [expires: 2009-07-18]
uid Ian Boston <ieb@apache.org>
sig 3 40E47E14 2008-07-19 Ian Boston <ieb@apache.org>
sig 51047D66 2009-04-30 Tony Stevenson <pctony@apache.org>
sub 4096g/1B6E03E8 2008-07-19 [expires: 2009-07-18]
sig 40E47E14 2008-07-19 Ian Boston <ieb@apache.org>

-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.8 (Darwin)

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
2CXltU6lxdMF6RTkDQ73ESqNbg==
=T/rN
-----END PGP PUBLIC KEY BLOCK-----
17 changes: 17 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -312,3 +312,20 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

===============================================================================
OpenSocial Javascript API

Copyright (c) 2009 The OpenSocial 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.

===============================================================================
34 changes: 6 additions & 28 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -1,39 +1,17 @@
Apache Shindig
Copyright 2008 The Apache Software Foundation
Copyright 2009 The Apache Software Foundation

This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).

-----------------------------------------------------------

This product includes software (Gadget Server, Gadget Container)
originally developed by Google Inc. (http://code.google.com/) and licensed
to the ASF as initial contribution for Shindig.

This distribution includes cryptographic software. The country in
which you currently reside may have restrictions on the import,
possession, use, and/or re-export to another country, of
encryption software. BEFORE using any encryption software, please
check your country's laws, regulations and policies concerning the
import, possession, or use, and re-export of encryption software, to
see if this is permitted. See <http://www.wassenaar.org/> for more
information.

The U.S. Government Department of Commerce, Bureau of Industry and
Security (BIS), has classified this software as Export Commodity
Control Number (ECCN) 5D002.C.1, which includes information security
software using or performing cryptographic functions with asymmetric
algorithms. The form and manner of this Apache Software Foundation
distribution makes it eligible for export under the License Exception
ENC Technology Software Unrestricted (TSU) exception (see the BIS
Export Administration Regulations, Section 740.13) for both object
code and source code.

The following provides more details on the included cryptographic
software:

Apache Shindig interfaces with the Java JCE APIs to provide
encryption of messages using the AES standard.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).

Apache Shindig PHP interfaces with the mcrypt API
<http://mcrypt.sourceforge.net/> to provide encryption
of messages using the AES standard.
This product includes other softwares depending to the implementations,
refer to the other NOTICE files in the sub directories.
73 changes: 64 additions & 9 deletions README
Original file line number Diff line number Diff line change
@@ -1,14 +1,69 @@
Welcome to Apache Shindig!
Apache Shindig

* Read java/README for instructions on using the java gadget servers.
What is it?
-----------

* To build and run the Java server see BUILD-JAVA
Shindig is a JavaScript container and implementations of the backend APIs
and proxy required for hosting OpenSocial applications.

* Read php/README for instructions on how to run a php gadget server
instead of a java gadget server.
Documentation
-------------

* Read javascript/README for instructions for using the Shindig Gadget
Container JavaScript to enable your page to render Gadgets using
gmodules.com or a server started up as described above.
The most up-to-date documentation can be found at http://incubator.apache.org/shindig/.

Read BUILD-JAVA for instructions on how to build and run the Java server.

Read java/README for instructions on how to run a Java gadget server.

Read php/README for instructions on how to run a php gadget server.

Read javascript/README for instructions for using the Shindig Gadget Container
JavaScript to enable your page to render Gadgets.

Read features/README for instructions on how to use features.

Licensing
---------

Please see the file called LICENSE in the java and php directories.

Shindig URLS
------------

Home Page: http://incubator.apache.org/shindig/
Downloads: http://incubator.apache.org/shindig/download/index.html
Mailing Lists: http://incubator.apache.org/shindig/mail-lists.html
Source Code: http://svn.apache.org/repos/asf/incubator/shindig/
Issue Tracking: https://issues.apache.org/jira/browse/SHINDIG
Wiki: http://cwiki.apache.org/confluence/display/SHINDIG/


This distribution includes cryptographic software. The country in
which you currently reside may have restrictions on the import,
possession, use, and/or re-export to another country, of
encryption software. BEFORE using any encryption software, please
check your country's laws, regulations and policies concerning the
import, possession, or use, and re-export of encryption software, to
see if this is permitted. See <http://www.wassenaar.org/> for more
information.

The U.S. Government Department of Commerce, Bureau of Industry and
Security (BIS), has classified this software as Export Commodity
Control Number (ECCN) 5D002.C.1, which includes information security
software using or performing cryptographic functions with asymmetric
algorithms. The form and manner of this Apache Software Foundation
distribution makes it eligible for export under the License Exception
ENC Technology Software Unrestricted (TSU) exception (see the BIS
Export Administration Regulations, Section 740.13) for both object
code and source code.

The following provides more details on the included cryptographic
software:

Apache Shindig PHP interfaces with the mcrypt API
<http://mcrypt.sourceforge.net/> to provide encryption
of messages using the AES standard.

Apache Shindig interfaces with the Java JCE APIs to provide
encryption of messages using the AES standard.

For more information, see http://incubator.apache.org/shindig/
19 changes: 19 additions & 0 deletions etc/cruisecontrol/config.xml
Original file line number Diff line number Diff line change
@@ -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.
--->

<cruisecontrol>
<project name="shindig">

Expand Down
16 changes: 11 additions & 5 deletions features/NOTICE
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
=========================================================================
== NOTICE file corresponding to the section 4 d of ==
== the Apache License, Version 2.0, ==
== in this case for the Apache Shindig distribution. ==
=========================================================================
Apache Shindig
Copyright 2009 The Apache Software Foundation

This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).

-----------------------------------------------------------

This product includes software (Gadget Server, Gadget Container)
originally developed by Google Inc. (http://code.google.com/) and licensed
Expand All @@ -16,3 +18,7 @@ Joerg Schaible (http://jsunit.berlios.de/).

This product includes software (swfobject) developed by
Geoff Stearns, Michael Williams, and Bobby van der Sluis (http://code.google.com/p/swfobject/)

This product includes software (opensocial-resources) developed by
The OpenSocial Foundation (http://opensocial-resources.googlecode.com/svn/spec/0.8/)

114 changes: 74 additions & 40 deletions features/README
Original file line number Diff line number Diff line change
@@ -1,40 +1,74 @@
You can automatically include new features into your shindig server by adding
them to this directory. Features should exist in a self-contained directory
with the following structure:

features
|_your-feature-name
|_feature.xml
|_code-to-run-inside-gadget.js
|_code-to-run-inside-container.js

The structure of feature.xml is as follows:
TODO: link to xml schema for feature.xml

<?xml version="1.0"?>
<feature>
<name>your-feature-name (required)</name>
<dependency>any dependency you have (optional, may have multiple)</dependency>
<gadget> (optional)
<script src="code-to-run-inside-gadget.js"/> (optional, may have multiple,
may use web resources as well but we strongly encourage bundling your
javascript with the xml)
</gadget>
<container> (optional)
<script src="code-to-run-inside-container.js"> (same as for <gadget>)
</container>
</feature>

Please always make sure that all files you provide are encoded as utf8.

When adding new features, your javascript should conform to shindig javascript
coding conventions. This means that you should not be producing new globals and
your feature should be compatible with Caja.

When committing a new feature, you should update the features.txt file by
running the following script in a unix-like environment:

ls -R1a features/**/*.xml > features/features.txt

TODO: Instructions for regenerating features.txt for other operating system
environments.
Apache Shindig Features

What is it?
-----------

Shindig is a JavaScript container and implementations of the backend APIs
and proxy required for hosting OpenSocial applications.

This is the features component of Shindig.

Documentation
-------------

The most up-to-date documentation can be found at http://incubator.apache.org/shindig/

Using features
--------------

You can automatically include new features into your shindig server by adding
them to this directory. Features should exist in a self-contained directory
with the following structure:

features
|_your-feature-name
|_feature.xml
|_code-to-run-inside-gadget.js
|_code-to-run-inside-container.js

The structure of feature.xml is as follows:
TODO: link to xml schema for feature.xml

<?xml version="1.0"?>
<feature>
<name>your-feature-name (required)</name>
<dependency>any dependency you have (optional, may have multiple)</dependency>
<gadget> (optional)
<script src="code-to-run-inside-gadget.js"/> (optional, may have multiple,
may use web resources as well but we strongly encourage bundling your
javascript with the xml)
</gadget>
<container> (optional)
<script src="code-to-run-inside-container.js"> (same as for <gadget>)
</container>
</feature>

Please always make sure that all files you provide are encoded as utf8.

When adding new features, your javascript should conform to shindig javascript
coding conventions. This means that you should not be producing new globals and
your feature should be compatible with Caja.

When committing a new feature, you should update the features.txt file by
running the following script in a unix-like environment:

ls -R1a features/**/*.xml > features/features.txt

TODO: Instructions for regenerating features.txt for other operating system
environments.

Licensing
---------

Please see the file called LICENSE.


Shindig URLS
------------

Home Page: http://incubator.apache.org/shindig/
Downloads: http://incubator.apache.org/shindig/download/index.html
Mailing Lists: http://incubator.apache.org/shindig/mail-lists.html
Source Code: http://svn.apache.org/repos/asf/incubator/shindig/
Issue Tracking: https://issues.apache.org/jira/browse/SHINDIG
Wiki: http://cwiki.apache.org/confluence/display/SHINDIG/
18 changes: 18 additions & 0 deletions features/src/main/javascript/features/features.txt
Original file line number Diff line number Diff line change
@@ -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.
#
# List each feature you want to support here

features/analytics/feature.xml
Expand Down
Loading

0 comments on commit e9732b7

Please sign in to comment.