You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by lu...@apache.org on 2012/05/22 21:07:58 UTC
git commit: Fix a few remains from incubation
Updated Branches:
refs/heads/master ef31a07e4 -> f1785fe88
Fix a few remains from incubation
- remove DISCLAIMER's
- update mentions of incubator and use deltacloud.apache.org instead
- update copyright years
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/f1785fe8
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/f1785fe8
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/f1785fe8
Branch: refs/heads/master
Commit: f1785fe880c6876b6a42d0691c6ffa5e3d345365
Parents: ef31a07
Author: David Lutterkort <lu...@redhat.com>
Authored: Tue May 22 12:05:47 2012 -0700
Committer: David Lutterkort <lu...@redhat.com>
Committed: Tue May 22 12:05:47 2012 -0700
----------------------------------------------------------------------
NOTICE | 2 +-
client/DISCLAIMER | 8 ---
client/NOTICE | 2 +-
clients/python/python-deltacloud-client.spec | 4 +-
clients/python/setup.py | 2 +-
examples/mobile/README.txt | 53 ++++++++++++++++-----
server/DISCLAIMER | 8 ---
server/NOTICE | 2 +-
server/README.md | 33 ++++++-------
server/support/fedora/deltacloud-core.spec | 2 +-
10 files changed, 63 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/f1785fe8/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 03de8ed..fad0b4b 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache Deltacloud
-Copyright 2010, 2011 The Apache Software Foundation
+Copyright 2010-2012 The Apache Software Foundation
This product includes software developed at The Apache Software Foundation
(http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/f1785fe8/client/DISCLAIMER
----------------------------------------------------------------------
diff --git a/client/DISCLAIMER b/client/DISCLAIMER
deleted file mode 100644
index e7567fc..0000000
--- a/client/DISCLAIMER
+++ /dev/null
@@ -1,8 +0,0 @@
-Apache Deltacloud is an effort undergoing incubation at The Apache Software
-Foundation (ASF), sponsored by the Incubator PMC. Incubation is required of
-all newly accepted projects until a further review indicates that the
-infrastructure, communications, and decision making process have stabilized
-in a manner consistent with other successful ASF projects. While
-incubation status is not necessarily a reflection of the completeness or
-stability of the code, it does indicate that the project has yet to be
-fully endorsed by the ASF.
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/f1785fe8/client/NOTICE
----------------------------------------------------------------------
diff --git a/client/NOTICE b/client/NOTICE
index 1d997e4..aff2b65 100644
--- a/client/NOTICE
+++ b/client/NOTICE
@@ -1,5 +1,5 @@
Apache Deltacloud
-Copyright 2010, 2011 The Apache Software Foundation
+Copyright 2010-2012 The Apache Software Foundation
This product includes software developed at The Apache Software Foundation
(http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/f1785fe8/clients/python/python-deltacloud-client.spec
----------------------------------------------------------------------
diff --git a/clients/python/python-deltacloud-client.spec b/clients/python/python-deltacloud-client.spec
index 3b58eb5..7fae101 100644
--- a/clients/python/python-deltacloud-client.spec
+++ b/clients/python/python-deltacloud-client.spec
@@ -12,8 +12,8 @@ Release: 1%{?dist}
Summary: Deltacloud API client for Python
Group: Applications/System
License: ASL 2.0
-URL: http://incubator.apache.org/deltacloud
-Source0: http://incubator.apache.org/deltacloud/clients/%{srcname}-%{version}.tar.gz
+URL: http://deltacloud.apache.org
+Source0: http://deltacloud.apache.org/clients/%{srcname}-%{version}.tar.gz
BuildArch: noarch
Requires: python2
Requires: libxml2-python
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/f1785fe8/clients/python/setup.py
----------------------------------------------------------------------
diff --git a/clients/python/setup.py b/clients/python/setup.py
index b05b7ef..a3fdb44 100644
--- a/clients/python/setup.py
+++ b/clients/python/setup.py
@@ -8,6 +8,6 @@ setup(name='deltacloud-client',
author='Michal Fojtik',
author_email='mfojtik@redhat.com',
license='GPLv2',
- url='http://incubator.apache.org/deltacloud/',
+ url='http://deltacloud.apache.org/',
py_modules=[ 'deltacloud' ]
)
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/f1785fe8/examples/mobile/README.txt
----------------------------------------------------------------------
diff --git a/examples/mobile/README.txt b/examples/mobile/README.txt
index 7c9c576..50b7f95 100644
--- a/examples/mobile/README.txt
+++ b/examples/mobile/README.txt
@@ -1,32 +1,59 @@
Author: Eric Woods, woodstae@gmail.com
Date: 13 May 2011
-This document explains how to deploy the DeltaCloud mobile application. For questions, email DeltaCloud's mailing list at deltacloud-dev@incubator.apache.org and I or another developer will respond.
+This document explains how to deploy the DeltaCloud mobile application.
+For questions, email DeltaCloud's mailing list at dev@deltacloud.apache.org
+and I or another developer will respond.
================
DEPLOYMENT STEPS
================
-1) Install Apache DeltaCloud 0.3.0
- a) Follow instructions here: http://incubator.apache.org/deltacloud/contribute.html
+1) Install Apache DeltaCloud 0.3.0
+ a) Follow instructions here: http://deltacloud.apache.org/contribute.html
b) If you have problems with rack, install a specific version: gem uninstall rack; gem ins -r rack --version '1.1.0'
-2) Start the Apache DeltaCloud server by issuing a command like deltacloudd -i sbc. Verify DeltaCloud is running at http://<host>:3001/api. For example: http://localhost:3001/api.
+2) Start the Apache DeltaCloud server by issuing a command like deltacloudd
+-i sbc. Verify DeltaCloud is running at http://<host>:3001/api. For
+example: http://localhost:3001/api.
-3) Deploy the mobile application demo. The mobile application is packaged as a WAR file. Deploy this WAR using your favorite application server, such as Apache Tomcat 6.0. The application MUST be deployed on the same host, but different port, as the DeltaCloud server. Start the server and verify that the mobile application is running at http://<host>:<port>/mobiledemo/demo.html where <host> == the DeltaCloud server's host and <port> != 3001. For example: http://localhost:8080/mobiledemo/demo.html.
+3) Deploy the mobile application demo. The mobile application is packaged
+as a WAR file. Deploy this WAR using your favorite application server,
+such as Apache Tomcat 6.0. The application MUST be deployed on the same
+host, but different port, as the DeltaCloud server. Start the server and
+verify that the mobile application is running at
+http://<host>:<port>/mobiledemo/demo.html where <host> == the DeltaCloud
+server's host and <port> != 3001. For example:
+http://localhost:8080/mobiledemo/demo.html.
-4) Access the mobile application either from the same machine (localhost) or externally. For example: http://1.234.5.67:8080/mobiledemo/demo.html
+4) Access the mobile application either from the same machine (localhost)
+or externally. For example: http://1.234.5.67:8080/mobiledemo/demo.html
===========
OTHER NOTES
===========
-* jQuery Mobile is the framework used for the native mobile look & feel. This framework is currently in alpha, so workarounds were necessary to get the demo working smoothly.
+* jQuery Mobile is the framework used for the native mobile look & feel.
+ This framework is currently in alpha, so workarounds were necessary to
+ get the demo working smoothly.
-* To view the demo's animations, use Safari or an iOS device. I haven't tested on Android powered devices, but Firefox does not display the animations.
+* To view the demo's animations, use Safari or an iOS device. I haven't
+ tested on Android powered devices, but Firefox does not display the
+ animations.
* For a video of the demo: https://docs.google.com/leaf?id=0B-zwcqgujo7CNDI3NGNhMzUtOTk0OC00ZDU2LWIyM2EtOGI3YWZjMjA4NzFi&hl=en&authkey=CIzPrI0F
-* To bypass the restriction of cross-domain calls to the DeltaCloud REST API, a proxy servlet is used to redirect REST calls from the same domain (host + port) as the mobile app to the DeltaCloud server, which runs under a different port. The servlet is configured in the WAR's web.xml. The proxy servlet is not currently configured to support REST calls to URLs containing dynamically supplied IDs (e.g. POST /api/instances/12345/reboot). This is preventing 'reboot', 'destroy', etc from working. It shouldn't be hard to set up a better proxy.
-
-* To tweak the host/port configuration, refer to demo.html where I set the dc_server variable. You may also have to tweak the proxy servlet configuration within web.xml.
-
-* To extract the source code (HTML/JS) from the WAR file, you can use gzip, or simply change the .war extension to .zip, then use your favorite unzipper.
\ No newline at end of file
+* To bypass the restriction of cross-domain calls to the DeltaCloud REST
+ API, a proxy servlet is used to redirect REST calls from the same domain
+ (host + port) as the mobile app to the DeltaCloud server, which runs
+ under a different port. The servlet is configured in the WAR's
+ web.xml. The proxy servlet is not currently configured to support REST
+ calls to URLs containing dynamically supplied IDs (e.g. POST
+ /api/instances/12345/reboot). This is preventing 'reboot', 'destroy',
+ etc from working. It shouldn't be hard to set up a better proxy.
+
+* To tweak the host/port configuration, refer to demo.html where I set the
+ dc_server variable. You may also have to tweak the proxy servlet
+ configuration within web.xml.
+
+* To extract the source code (HTML/JS) from the WAR file, you can use gzip,
+ or simply change the .war extension to .zip, then use your favorite
+ unzipper.
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/f1785fe8/server/DISCLAIMER
----------------------------------------------------------------------
diff --git a/server/DISCLAIMER b/server/DISCLAIMER
deleted file mode 100644
index e7567fc..0000000
--- a/server/DISCLAIMER
+++ /dev/null
@@ -1,8 +0,0 @@
-Apache Deltacloud is an effort undergoing incubation at The Apache Software
-Foundation (ASF), sponsored by the Incubator PMC. Incubation is required of
-all newly accepted projects until a further review indicates that the
-infrastructure, communications, and decision making process have stabilized
-in a manner consistent with other successful ASF projects. While
-incubation status is not necessarily a reflection of the completeness or
-stability of the code, it does indicate that the project has yet to be
-fully endorsed by the ASF.
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/f1785fe8/server/NOTICE
----------------------------------------------------------------------
diff --git a/server/NOTICE b/server/NOTICE
index 03de8ed..fad0b4b 100644
--- a/server/NOTICE
+++ b/server/NOTICE
@@ -1,5 +1,5 @@
Apache Deltacloud
-Copyright 2010, 2011 The Apache Software Foundation
+Copyright 2010-2012 The Apache Software Foundation
This product includes software developed at The Apache Software Foundation
(http://www.apache.org/).
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/f1785fe8/server/README.md
----------------------------------------------------------------------
diff --git a/server/README.md b/server/README.md
index aacc0af..62d778a 100644
--- a/server/README.md
+++ b/server/README.md
@@ -6,7 +6,7 @@ Deltacloud protects yourapps from cloud API changes and incompatibilities,
so you can concentrate on managing cloud instances the way you want.
You can find more documentation at the Deltacloud web site at:
-[incubator.apache.org/deltacloud](http://incubator.apache.org/deltacloud/)
+[deltacloud.apache.org/](http://deltacloud.apache.org/)
Prerequisites
-------------
@@ -19,11 +19,9 @@ Fedora, or install the gem with `gem install deltacloud-core`.
If you do not want to do that, have a look at the dependencies in the gem
spec for deltacloud-core and install them manually from git repository:
- $ mkdir deltacloud
- $ cd deltacloud
- $ git svn init -s https://svn.apache.org/repos/asf/incubator/deltacloud
- $ git svn fetch --log-window-size 10000
- $ git clone git://git.apache.org/deltacloud.git core
+ $ git clone git://git.apache.org/deltacloud.git
+ $ cd deltacloud/server
+ $ bundle install
Running
-------
@@ -37,24 +35,25 @@ the data found there. If you need to start over from scratch, just delete
that directory and restart deltacloudd.
Once you have the server running, point your browser at
-[localhost:3001/api](http://localhost:3001/api) to get a HTML version of Deltacloud Core.
-If you want to look at the XML that REST clients will see, simply add
-`?format=xml` to URLs. Deltacloud Core does content negotiation; REST clients should not
-set _format_ to URLs, they should simply set the _Accept_ header appropriately.
+[localhost:3001/api](http://localhost:3001/api) to get a HTML version of
+Deltacloud Core. If you want to look at the XML that REST clients will
+see, simply add `?format=xml` to URLs. Deltacloud Core does content
+negotiation; REST clients should not set _format_ to URLs, they should
+simply set the _Accept_ header appropriately.
Some operations require authentication. For the mock driver, the username
and password are *mockuser* and *mockpassword*. A current list of drivers
and what kind of credentials they need can be found at
-Deltacloud Incubator site (http://incubator.apache.org/deltacloud/drivers.html)
+the Deltacloud site (http://deltacloud.apache.org/drivers.html)
-Happy hacking - and do not forget to send patches to the mailing list (see
-[deltacloud-devel](https://fedorahosted.org/mailman/listinfo/deltacloud-devel) or
-[incubator-deltacloud-dev](http://mail-archives.apache.org/mod_mbox/incubator-deltacloud-dev)
-You could send patches using `git format-patch master` and then `git send-email
---thread`. Example _git/.config_ file:
+Happy hacking - and do not forget to send patches to the mailing list (to
+subscribe send email to dev-subscribe@deltacloud.apache.org)
+
+You could send patches using `git format-patch master` and then `git
+send-email --thread`. Example _.git/config_ file:
[sendemail]
- to = deltacloud-dev@incubator.apache.org
+ to = dev@deltacloud.apache.org
signedoffbycc=no
chainreplyto=no
smtpserver=YOUR_SMTP_SERVER_HERE
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/f1785fe8/server/support/fedora/deltacloud-core.spec
----------------------------------------------------------------------
diff --git a/server/support/fedora/deltacloud-core.spec b/server/support/fedora/deltacloud-core.spec
index 0a7cba8..c87e92b 100644
--- a/server/support/fedora/deltacloud-core.spec
+++ b/server/support/fedora/deltacloud-core.spec
@@ -6,7 +6,7 @@ Version: 0.4.0
Release: 4%{?dist}
Group: Development/Languages
License: ASL 2.0 and MIT
-URL: http://incubator.apache.org/deltacloud
+URL: http://deltacloud.apache.org/
Source0: http://gems.rubyforge.org/gems/%{name}-%{version}.gem
Source1: deltacloudd-fedora
Source2: deltacloud-core.init