Author: scottbw
Date: Fri Jun 18 11:32:51 2010
New Revision: 955946
URL: http://svn.apache.org/viewvc?rev=955946&view=rev
Log:
updating PP branch with changes in trunk (continued)
Added:
incubator/wookie/branches/pluggablepersistence/connector/flash_flex/
- copied from r955931, incubator/wookie/trunk/connector/flash_flex/
incubator/wookie/branches/pluggablepersistence/connector/flash_flex/Example.mxml
- copied unchanged from r955931,
incubator/wookie/trunk/connector/flash_flex/Example.mxml
incubator/wookie/branches/pluggablepersistence/connector/flash_flex/README.txt
- copied unchanged from r955931,
incubator/wookie/trunk/connector/flash_flex/README.txt
incubator/wookie/branches/pluggablepersistence/connector/flash_flex/com/
- copied from r955931, incubator/wookie/trunk/connector/flash_flex/com/
incubator/wookie/branches/pluggablepersistence/connector/flash_flex/com/google/
- copied from r955931,
incubator/wookie/trunk/connector/flash_flex/com/google/
incubator/wookie/branches/pluggablepersistence/connector/flash_flex/com/google/code/
- copied from r955931,
incubator/wookie/trunk/connector/flash_flex/com/google/code/
incubator/wookie/branches/pluggablepersistence/connector/flash_flex/com/google/code/flexiframe/
- copied from r955931,
incubator/wookie/trunk/connector/flash_flex/com/google/code/flexiframe/
incubator/wookie/branches/pluggablepersistence/connector/flash_flex/com/google/code/flexiframe/IFrame.as
- copied unchanged from r955931,
incubator/wookie/trunk/connector/flash_flex/com/google/code/flexiframe/IFrame.as
incubator/wookie/branches/pluggablepersistence/connector/flash_flex/com/google/code/flexiframe/IFrameExternalCalls.as
- copied unchanged from r955931,
incubator/wookie/trunk/connector/flash_flex/com/google/code/flexiframe/IFrameExternalCalls.as
incubator/wookie/branches/pluggablepersistence/connector/flash_flex/com/google/code/flexiframe/README
- copied unchanged from r955931,
incubator/wookie/trunk/connector/flash_flex/com/google/code/flexiframe/README
incubator/wookie/branches/pluggablepersistence/connector/flash_flex/com/google/code/flexiframe/assets/
- copied from r955931,
incubator/wookie/trunk/connector/flash_flex/com/google/code/flexiframe/assets/
incubator/wookie/branches/pluggablepersistence/connector/flash_flex/com/google/code/flexiframe/assets/flex-iframe-logo-128.png
- copied unchanged from r955931,
incubator/wookie/trunk/connector/flash_flex/com/google/code/flexiframe/assets/flex-iframe-logo-128.png
incubator/wookie/branches/pluggablepersistence/connector/flash_flex/com/google/code/flexiframe/assets/flex-iframe-logo-16.png
- copied unchanged from r955931,
incubator/wookie/trunk/connector/flash_flex/com/google/code/flexiframe/assets/flex-iframe-logo-16.png
incubator/wookie/branches/pluggablepersistence/connector/flash_flex/com/google/code/flexiframe/assets/flex-iframe-logo-32.png
- copied unchanged from r955931,
incubator/wookie/trunk/connector/flash_flex/com/google/code/flexiframe/assets/flex-iframe-logo-32.png
incubator/wookie/branches/pluggablepersistence/connector/flash_flex/com/google/code/flexiframe/assets/flex-iframe-logo-48.png
- copied unchanged from r955931,
incubator/wookie/trunk/connector/flash_flex/com/google/code/flexiframe/assets/flex-iframe-logo-48.png
incubator/wookie/branches/pluggablepersistence/connector/flash_flex/org/
- copied from r955931, incubator/wookie/trunk/connector/flash_flex/org/
incubator/wookie/branches/pluggablepersistence/connector/flash_flex/org/apache/
- copied from r955931,
incubator/wookie/trunk/connector/flash_flex/org/apache/
incubator/wookie/branches/pluggablepersistence/connector/flash_flex/org/apache/wookie/
- copied from r955931,
incubator/wookie/trunk/connector/flash_flex/org/apache/wookie/
incubator/wookie/branches/pluggablepersistence/connector/flash_flex/org/apache/wookie/connector/
- copied from r955931,
incubator/wookie/trunk/connector/flash_flex/org/apache/wookie/connector/
incubator/wookie/branches/pluggablepersistence/connector/flash_flex/org/apache/wookie/connector/example/
- copied from r955931,
incubator/wookie/trunk/connector/flash_flex/org/apache/wookie/connector/example/
incubator/wookie/branches/pluggablepersistence/connector/flash_flex/org/apache/wookie/connector/example/AddConnectionFormTitleWindow.mxml
- copied unchanged from r955931,
incubator/wookie/trunk/connector/flash_flex/org/apache/wookie/connector/example/AddConnectionFormTitleWindow.mxml
incubator/wookie/branches/pluggablepersistence/connector/flash_flex/org/apache/wookie/connector/example/AddUserFormTitleWindow.mxml
- copied unchanged from r955931,
incubator/wookie/trunk/connector/flash_flex/org/apache/wookie/connector/example/AddUserFormTitleWindow.mxml
incubator/wookie/branches/pluggablepersistence/connector/flash_flex/org/apache/wookie/connector/example/OriginalUserManager.mxml
- copied unchanged from r955931,
incubator/wookie/trunk/connector/flash_flex/org/apache/wookie/connector/example/OriginalUserManager.mxml
incubator/wookie/branches/pluggablepersistence/connector/flash_flex/org/apache/wookie/connector/example/OriginalWookieServerConnectionManager.mxml
- copied unchanged from r955931,
incubator/wookie/trunk/connector/flash_flex/org/apache/wookie/connector/example/OriginalWookieServerConnectionManager.mxml
incubator/wookie/branches/pluggablepersistence/connector/flash_flex/org/apache/wookie/connector/example/UserManager.mxml
- copied unchanged from r955931,
incubator/wookie/trunk/connector/flash_flex/org/apache/wookie/connector/example/UserManager.mxml
incubator/wookie/branches/pluggablepersistence/connector/flash_flex/org/apache/wookie/connector/example/WookieConnectorServiceContainer.as
- copied unchanged from r955931,
incubator/wookie/trunk/connector/flash_flex/org/apache/wookie/connector/example/WookieConnectorServiceContainer.as
incubator/wookie/branches/pluggablepersistence/connector/flash_flex/org/apache/wookie/connector/example/WookieConnectorServiceView.mxml
- copied unchanged from r955931,
incubator/wookie/trunk/connector/flash_flex/org/apache/wookie/connector/example/WookieConnectorServiceView.mxml
incubator/wookie/branches/pluggablepersistence/connector/flash_flex/org/apache/wookie/connector/example/WookieServerConnectionManager.mxml
- copied unchanged from r955931,
incubator/wookie/trunk/connector/flash_flex/org/apache/wookie/connector/example/WookieServerConnectionManager.mxml
incubator/wookie/branches/pluggablepersistence/connector/flash_flex/org/apache/wookie/connector/framework/
- copied from r955931,
incubator/wookie/trunk/connector/flash_flex/org/apache/wookie/connector/framework/
incubator/wookie/branches/pluggablepersistence/connector/flash_flex/org/apache/wookie/connector/framework/IWookieConnectorService.as
- copied unchanged from r955931,
incubator/wookie/trunk/connector/flash_flex/org/apache/wookie/connector/framework/IWookieConnectorService.as
incubator/wookie/branches/pluggablepersistence/connector/flash_flex/org/apache/wookie/connector/framework/User.as
- copied unchanged from r955931,
incubator/wookie/trunk/connector/flash_flex/org/apache/wookie/connector/framework/User.as
incubator/wookie/branches/pluggablepersistence/connector/flash_flex/org/apache/wookie/connector/framework/Widget.as
- copied unchanged from r955931,
incubator/wookie/trunk/connector/flash_flex/org/apache/wookie/connector/framework/Widget.as
incubator/wookie/branches/pluggablepersistence/connector/flash_flex/org/apache/wookie/connector/framework/WidgetInstance.as
- copied unchanged from r955931,
incubator/wookie/trunk/connector/flash_flex/org/apache/wookie/connector/framework/WidgetInstance.as
incubator/wookie/branches/pluggablepersistence/connector/flash_flex/org/apache/wookie/connector/framework/WidgetInstanceLoader.as
- copied unchanged from r955931,
incubator/wookie/trunk/connector/flash_flex/org/apache/wookie/connector/framework/WidgetInstanceLoader.as
incubator/wookie/branches/pluggablepersistence/connector/flash_flex/org/apache/wookie/connector/framework/WidgetInstancePropertyType.as
- copied unchanged from r955931,
incubator/wookie/trunk/connector/flash_flex/org/apache/wookie/connector/framework/WidgetInstancePropertyType.as
incubator/wookie/branches/pluggablepersistence/connector/flash_flex/org/apache/wookie/connector/framework/WidgetInstances.as
- copied unchanged from r955931,
incubator/wookie/trunk/connector/flash_flex/org/apache/wookie/connector/framework/WidgetInstances.as
incubator/wookie/branches/pluggablepersistence/connector/flash_flex/org/apache/wookie/connector/framework/WookieConnectorException.as
- copied unchanged from r955931,
incubator/wookie/trunk/connector/flash_flex/org/apache/wookie/connector/framework/WookieConnectorException.as
incubator/wookie/branches/pluggablepersistence/connector/flash_flex/org/apache/wookie/connector/framework/WookieConnectorService.as
- copied unchanged from r955931,
incubator/wookie/trunk/connector/flash_flex/org/apache/wookie/connector/framework/WookieConnectorService.as
incubator/wookie/branches/pluggablepersistence/connector/flash_flex/org/apache/wookie/connector/framework/WookieServerConnection.as
- copied unchanged from r955931,
incubator/wookie/trunk/connector/flash_flex/org/apache/wookie/connector/framework/WookieServerConnection.as
incubator/wookie/branches/pluggablepersistence/licenses/rat-ignore.txt
- copied, changed from r949078,
incubator/wookie/trunk/licenses/rat-ignore.txt
Modified:
incubator/wookie/branches/pluggablepersistence/connector/CSharp/WookieService/Properties/AssemblyInfo.cs
incubator/wookie/branches/pluggablepersistence/connector/java/ivy.xml
incubator/wookie/branches/pluggablepersistence/connector/java/src/org/apache/wookie/connector/framework/AbstractWookieConnectorService.java
incubator/wookie/branches/pluggablepersistence/connector/java/src/org/apache/wookie/connector/framework/WidgetInstance.java
incubator/wookie/branches/pluggablepersistence/connector/php/Logger.php
incubator/wookie/branches/pluggablepersistence/features/ (props changed)
incubator/wookie/branches/pluggablepersistence/features/build.xml (props
changed)
incubator/wookie/branches/pluggablepersistence/features/camera/ (props
changed)
incubator/wookie/branches/pluggablepersistence/features/camera/build.xml
(props changed)
incubator/wookie/branches/pluggablepersistence/features/camera/licenses.txt
(props changed)
incubator/wookie/branches/pluggablepersistence/features/camera/shared/
(props changed)
incubator/wookie/branches/pluggablepersistence/features/camera/shared/bondi_camera.js
(props changed)
incubator/wookie/branches/pluggablepersistence/features/camera/shared/camcanvas.html
(props changed)
incubator/wookie/branches/pluggablepersistence/features/camera/shared/camcanvas.swf
(props changed)
incubator/wookie/branches/pluggablepersistence/features/camera/shared/jquery.js
(props changed)
incubator/wookie/branches/pluggablepersistence/features/camera/shared/loadingAnimation.gif
(props changed)
incubator/wookie/branches/pluggablepersistence/features/camera/shared/snap.png
(props changed)
incubator/wookie/branches/pluggablepersistence/features/camera/shared/thickbox.css
(props changed)
incubator/wookie/branches/pluggablepersistence/features/camera/shared/thickbox.js
(props changed)
incubator/wookie/branches/pluggablepersistence/features/camera/src/
(props changed)
incubator/wookie/branches/pluggablepersistence/features/camera/src/org/
(props changed)
incubator/wookie/branches/pluggablepersistence/features/camera/src/org/apache/
(props changed)
incubator/wookie/branches/pluggablepersistence/features/camera/src/org/apache/wookie/
(props changed)
incubator/wookie/branches/pluggablepersistence/features/camera/src/org/apache/wookie/feature/
(props changed)
incubator/wookie/branches/pluggablepersistence/features/camera/src/org/apache/wookie/feature/bondi/
(props changed)
incubator/wookie/branches/pluggablepersistence/features/camera/src/org/apache/wookie/feature/bondi/camera/
(props changed)
incubator/wookie/branches/pluggablepersistence/features/camera/src/org/apache/wookie/feature/bondi/camera/CameraFeature.java
(props changed)
incubator/wookie/branches/pluggablepersistence/licenses/all_licenses.txt
incubator/wookie/branches/pluggablepersistence/parser/java/ivy.xml
incubator/wookie/branches/pluggablepersistence/parser/java/src-test/org/apache/wookie/w3c/test/LocalizedContentTest.java
incubator/wookie/branches/pluggablepersistence/parser/java/src/org/apache/wookie/w3c/util/WidgetPackageUtils.java
Modified:
incubator/wookie/branches/pluggablepersistence/connector/CSharp/WookieService/Properties/AssemblyInfo.cs
URL:
http://svn.apache.org/viewvc/incubator/wookie/branches/pluggablepersistence/connector/CSharp/WookieService/Properties/AssemblyInfo.cs?rev=955946&r1=955945&r2=955946&view=diff
==============================================================================
---
incubator/wookie/branches/pluggablepersistence/connector/CSharp/WookieService/Properties/AssemblyInfo.cs
(original)
+++
incubator/wookie/branches/pluggablepersistence/connector/CSharp/WookieService/Properties/AssemblyInfo.cs
Fri Jun 18 11:32:51 2010
@@ -1,3 +1,16 @@
+/*
+* 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.
+*/
#region Using directives
using System;
Modified: incubator/wookie/branches/pluggablepersistence/connector/java/ivy.xml
URL:
http://svn.apache.org/viewvc/incubator/wookie/branches/pluggablepersistence/connector/java/ivy.xml?rev=955946&r1=955945&r2=955946&view=diff
==============================================================================
--- incubator/wookie/branches/pluggablepersistence/connector/java/ivy.xml
(original)
+++ incubator/wookie/branches/pluggablepersistence/connector/java/ivy.xml Fri
Jun 18 11:32:51 2010
@@ -1,3 +1,19 @@
+<!--
+ 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.
+-->
<ivy-module version="2.0">
<info organisation="org.apache.incubator" module="wookieJavaConnector"
revision="0.1.0-SNAPSHOT"/>
Modified:
incubator/wookie/branches/pluggablepersistence/connector/java/src/org/apache/wookie/connector/framework/AbstractWookieConnectorService.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/branches/pluggablepersistence/connector/java/src/org/apache/wookie/connector/framework/AbstractWookieConnectorService.java?rev=955946&r1=955945&r2=955946&view=diff
==============================================================================
---
incubator/wookie/branches/pluggablepersistence/connector/java/src/org/apache/wookie/connector/framework/AbstractWookieConnectorService.java
(original)
+++
incubator/wookie/branches/pluggablepersistence/connector/java/src/org/apache/wookie/connector/framework/AbstractWookieConnectorService.java
Fri Jun 18 11:32:51 2010
@@ -1,3 +1,16 @@
+/*
+ * 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.
+ */
package org.apache.wookie.connector.framework;
import java.io.IOException;
Modified:
incubator/wookie/branches/pluggablepersistence/connector/java/src/org/apache/wookie/connector/framework/WidgetInstance.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/branches/pluggablepersistence/connector/java/src/org/apache/wookie/connector/framework/WidgetInstance.java?rev=955946&r1=955945&r2=955946&view=diff
==============================================================================
---
incubator/wookie/branches/pluggablepersistence/connector/java/src/org/apache/wookie/connector/framework/WidgetInstance.java
(original)
+++
incubator/wookie/branches/pluggablepersistence/connector/java/src/org/apache/wookie/connector/framework/WidgetInstance.java
Fri Jun 18 11:32:51 2010
@@ -1,3 +1,16 @@
+/*
+ * 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.
+ */
package org.apache.wookie.connector.framework;
/**
@@ -63,4 +76,4 @@ public class WidgetInstance {
this.width = width;
}
-}
\ No newline at end of file
+}
Modified:
incubator/wookie/branches/pluggablepersistence/connector/php/Logger.php
URL:
http://svn.apache.org/viewvc/incubator/wookie/branches/pluggablepersistence/connector/php/Logger.php?rev=955946&r1=955945&r2=955946&view=diff
==============================================================================
--- incubator/wookie/branches/pluggablepersistence/connector/php/Logger.php
(original)
+++ incubator/wookie/branches/pluggablepersistence/connector/php/Logger.php Fri
Jun 18 11:32:51 2010
@@ -52,15 +52,17 @@ class Logger {
*/
public function write($str) {
$path = $this->getPath();
- if(is_dir($path) && !empty($path)) {
- $str = "[ ".date("d/m/Y H:i:s")." ] ".$str."\n";
- $fileWriter =
@file_put_contents($path."wookie_php.0.log", $str, FILE_APPEND);
- if(!$fileWriter) {
- echo "<b>Wookie PHP: Writing to log failed,
check permissions/path</b>";
- }
- } else {
- echo "<b>Wookie PHP: Path is not a directory</b>";
- }
+ if(!empty($path)) {
+ if(is_dir($path)) {
+ $str = "[ ".date("d/m/Y H:i:s")." ] ".$str."\n";
+ $fileWriter =
@file_put_contents($path."wookie_php.0.log", $str, FILE_APPEND);
+ if(!$fileWriter) {
+ echo "<b>Wookie PHP: Writing to log failed,
check permissions/path</b>";
+ }
+ } else {
+ echo "<b>Wookie PHP: Path is not a directory</b>";
+ }
+ }
}
}
Propchange: incubator/wookie/branches/pluggablepersistence/features/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jun 18 11:32:51 2010
@@ -0,0 +1,2 @@
+/incubator/wookie/branches/standalone/features:827972-831908
+/incubator/wookie/trunk/features:949078-955931*
Propchange: incubator/wookie/branches/pluggablepersistence/features/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jun 18 11:32:51 2010
@@ -0,0 +1,2 @@
+/incubator/wookie/branches/standalone/features/build.xml:827972-831908
+/incubator/wookie/trunk/features/build.xml:949078-955931
Propchange: incubator/wookie/branches/pluggablepersistence/features/camera/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jun 18 11:32:51 2010
@@ -0,0 +1,2 @@
+/incubator/wookie/branches/standalone/features/camera:827972-831908
+/incubator/wookie/trunk/features/camera:949078-955931*
Propchange:
incubator/wookie/branches/pluggablepersistence/features/camera/build.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jun 18 11:32:51 2010
@@ -0,0 +1,2 @@
+/incubator/wookie/branches/standalone/features/camera/build.xml:827972-831908
+/incubator/wookie/trunk/features/camera/build.xml:949078-955931
Propchange:
incubator/wookie/branches/pluggablepersistence/features/camera/licenses.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jun 18 11:32:51 2010
@@ -0,0 +1,2 @@
+/incubator/wookie/branches/standalone/features/camera/licenses.txt:827972-831908
+/incubator/wookie/trunk/features/camera/licenses.txt:949078-955931
Propchange:
incubator/wookie/branches/pluggablepersistence/features/camera/shared/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jun 18 11:32:51 2010
@@ -0,0 +1,2 @@
+/incubator/wookie/branches/standalone/features/camera/shared:827972-831908
+/incubator/wookie/trunk/features/camera/shared:949078-955931*
Propchange:
incubator/wookie/branches/pluggablepersistence/features/camera/shared/bondi_camera.js
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jun 18 11:32:51 2010
@@ -0,0 +1,2 @@
+/incubator/wookie/branches/standalone/features/camera/shared/bondi_camera.js:827972-831908
+/incubator/wookie/trunk/features/camera/shared/bondi_camera.js:949078-955931
Propchange:
incubator/wookie/branches/pluggablepersistence/features/camera/shared/camcanvas.html
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jun 18 11:32:51 2010
@@ -0,0 +1,2 @@
+/incubator/wookie/branches/standalone/features/camera/shared/camcanvas.html:827972-831908
+/incubator/wookie/trunk/features/camera/shared/camcanvas.html:949078-955931
Propchange:
incubator/wookie/branches/pluggablepersistence/features/camera/shared/camcanvas.swf
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jun 18 11:32:51 2010
@@ -0,0 +1,2 @@
+/incubator/wookie/branches/standalone/features/camera/shared/camcanvas.swf:827972-831908
+/incubator/wookie/trunk/features/camera/shared/camcanvas.swf:949078-955931
Propchange:
incubator/wookie/branches/pluggablepersistence/features/camera/shared/jquery.js
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jun 18 11:32:51 2010
@@ -0,0 +1,2 @@
+/incubator/wookie/branches/standalone/features/camera/shared/jquery.js:827972-831908
+/incubator/wookie/trunk/features/camera/shared/jquery.js:949078-955931
Propchange:
incubator/wookie/branches/pluggablepersistence/features/camera/shared/loadingAnimation.gif
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jun 18 11:32:51 2010
@@ -0,0 +1,2 @@
+/incubator/wookie/branches/standalone/features/camera/shared/loadingAnimation.gif:827972-831908
+/incubator/wookie/trunk/features/camera/shared/loadingAnimation.gif:949078-955931
Propchange:
incubator/wookie/branches/pluggablepersistence/features/camera/shared/snap.png
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jun 18 11:32:51 2010
@@ -0,0 +1,2 @@
+/incubator/wookie/branches/standalone/features/camera/shared/snap.png:827972-831908
+/incubator/wookie/trunk/features/camera/shared/snap.png:949078-955931
Propchange:
incubator/wookie/branches/pluggablepersistence/features/camera/shared/thickbox.css
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jun 18 11:32:51 2010
@@ -0,0 +1,2 @@
+/incubator/wookie/branches/standalone/features/camera/shared/thickbox.css:827972-831908
+/incubator/wookie/trunk/features/camera/shared/thickbox.css:949078-955931
Propchange:
incubator/wookie/branches/pluggablepersistence/features/camera/shared/thickbox.js
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jun 18 11:32:51 2010
@@ -0,0 +1,2 @@
+/incubator/wookie/branches/standalone/features/camera/shared/thickbox.js:827972-831908
+/incubator/wookie/trunk/features/camera/shared/thickbox.js:949078-955931
Propchange: incubator/wookie/branches/pluggablepersistence/features/camera/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jun 18 11:32:51 2010
@@ -0,0 +1,2 @@
+/incubator/wookie/branches/standalone/features/camera/src:827972-831908
+/incubator/wookie/trunk/features/camera/src:949078-955931*
Propchange:
incubator/wookie/branches/pluggablepersistence/features/camera/src/org/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jun 18 11:32:51 2010
@@ -0,0 +1,2 @@
+/incubator/wookie/branches/standalone/features/camera/src/org:827972-831908
+/incubator/wookie/trunk/features/camera/src/org:949078-955931*
Propchange:
incubator/wookie/branches/pluggablepersistence/features/camera/src/org/apache/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jun 18 11:32:51 2010
@@ -0,0 +1,2 @@
+/incubator/wookie/branches/standalone/features/camera/src/org/apache:827972-831908
+/incubator/wookie/trunk/features/camera/src/org/apache:949078-955931*
Propchange:
incubator/wookie/branches/pluggablepersistence/features/camera/src/org/apache/wookie/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jun 18 11:32:51 2010
@@ -0,0 +1,2 @@
+/incubator/wookie/branches/standalone/features/camera/src/org/apache/wookie:827972-831908
+/incubator/wookie/trunk/features/camera/src/org/apache/wookie:949078-955931*
Propchange:
incubator/wookie/branches/pluggablepersistence/features/camera/src/org/apache/wookie/feature/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jun 18 11:32:51 2010
@@ -0,0 +1,2 @@
+/incubator/wookie/branches/standalone/features/camera/src/org/apache/wookie/feature:827972-831908
+/incubator/wookie/trunk/features/camera/src/org/apache/wookie/feature:949078-955931*
Propchange:
incubator/wookie/branches/pluggablepersistence/features/camera/src/org/apache/wookie/feature/bondi/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jun 18 11:32:51 2010
@@ -0,0 +1,2 @@
+/incubator/wookie/branches/standalone/features/camera/src/org/apache/wookie/feature/bondi:827972-831908
+/incubator/wookie/trunk/features/camera/src/org/apache/wookie/feature/bondi:949078-955931*
Propchange:
incubator/wookie/branches/pluggablepersistence/features/camera/src/org/apache/wookie/feature/bondi/camera/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jun 18 11:32:51 2010
@@ -0,0 +1,2 @@
+/incubator/wookie/branches/standalone/features/camera/src/org/apache/wookie/feature/bondi/camera:827972-831908
+/incubator/wookie/trunk/features/camera/src/org/apache/wookie/feature/bondi/camera:949078-955931*
Propchange:
incubator/wookie/branches/pluggablepersistence/features/camera/src/org/apache/wookie/feature/bondi/camera/CameraFeature.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jun 18 11:32:51 2010
@@ -0,0 +1,2 @@
+/incubator/wookie/branches/standalone/features/camera/src/org/apache/wookie/feature/bondi/camera/CameraFeature.java:827972-831908
+/incubator/wookie/trunk/features/camera/src/org/apache/wookie/feature/bondi/camera/CameraFeature.java:949078-955931
Modified:
incubator/wookie/branches/pluggablepersistence/licenses/all_licenses.txt
URL:
http://svn.apache.org/viewvc/incubator/wookie/branches/pluggablepersistence/licenses/all_licenses.txt?rev=955946&r1=955945&r2=955946&view=diff
==============================================================================
--- incubator/wookie/branches/pluggablepersistence/licenses/all_licenses.txt
(original)
+++ incubator/wookie/branches/pluggablepersistence/licenses/all_licenses.txt
Fri Jun 18 11:32:51 2010
@@ -72,4 +72,12 @@ UrlEncodedQueryString.java
icu4j.jar
Containing Project URL: http://site.icu-project.org/
- License: X (see
http://source.icu-project.org/repos/icu/icu4j/tags/release-4-2-1/license.html)
\ No newline at end of file
+ License: X (see
http://source.icu-project.org/repos/icu/icu4j/tags/release-4-2-1/license.html)
+
+widgets/sudoku/json.js
+ Containing Project URL: http://json.org
+ License: JSON (see http://www.crockford.com/JSON/license.html)
+
+widgets/todo/json2.js
+ Containing Project URL: http://json.org
+ License: Domain (See http://www.JSON.org/js.html)
Copied: incubator/wookie/branches/pluggablepersistence/licenses/rat-ignore.txt
(from r949078, incubator/wookie/trunk/licenses/rat-ignore.txt)
URL:
http://svn.apache.org/viewvc/incubator/wookie/branches/pluggablepersistence/licenses/rat-ignore.txt?p2=incubator/wookie/branches/pluggablepersistence/licenses/rat-ignore.txt&p1=incubator/wookie/trunk/licenses/rat-ignore.txt&r1=949078&r2=955946&rev=955946&view=diff
==============================================================================
--- incubator/wookie/trunk/licenses/rat-ignore.txt (original)
+++ incubator/wookie/branches/pluggablepersistence/licenses/rat-ignore.txt Fri
Jun 18 11:32:51 2010
@@ -1,5 +1,50 @@
-licenses
+licenses/
readm*.txt
-.settings
+.settings/
WebContent/META-INF/MANIFEST.MF
-WebContent/shared/js/jquery
+WebContent/shared/js/jquery/**
+project_admin/
+schemas/
+shindig/readme_shindig.txt
+build/
+**/build/**
+**/**csproj**
+connector/CSharp/CSharp.sln
+**/*.properties
+scripts/
+util/UrlEncodedQueryString.java
+tutorials/geoLocation/legal/
+**/dist/**
+.classpath
+.project
+
+# Group all the widgets stuff below.
+
+widgets/localetest/index.htm
+widgets/localetest/locales/
+widgets/camera/icon.svg
+
+# anything below is under a different license header
+# needs checking if relevant licenses are included
+# at top level
+
+features/camera/licenses.txt
+features/camera/shared/camcanvas.html
+features/camera/shared/jquery.js
+features/camera/shared/thickbox.css
+features/camera/shared/thickbox.js
+src/org/apache/wookie/util/UrlEncodedQueryString.java
+tutorials/geoLocation/scripts/geo.js
+tutorials/geoLocation/scripts/geo_position_js_simulator.js
+widgets/bubbles/config.xml
+widgets/bubbles/index.html
+widgets/bubbles/licence.txt
+widgets/bubbles/script.js
+widgets/bubbles/styles.css
+widgets/sudoku/json.js
+widgets/sudoku/jquery.js
+widgets/todo/json2.js
+widgets/natter/jquery.js
+widgets/natter/smileys/Emoticons.plist
+widgets/wookiewiki/creole.js
+
Modified: incubator/wookie/branches/pluggablepersistence/parser/java/ivy.xml
URL:
http://svn.apache.org/viewvc/incubator/wookie/branches/pluggablepersistence/parser/java/ivy.xml?rev=955946&r1=955945&r2=955946&view=diff
==============================================================================
--- incubator/wookie/branches/pluggablepersistence/parser/java/ivy.xml
(original)
+++ incubator/wookie/branches/pluggablepersistence/parser/java/ivy.xml Fri Jun
18 11:32:51 2010
@@ -1,3 +1,19 @@
+<!--
+ 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.
+-->
<ivy-module version="2.0">
<info organisation="org.apache.incubator" module="wookieW3CParser"
revision="0.1.0-SNAPSHOT"/>
Modified:
incubator/wookie/branches/pluggablepersistence/parser/java/src-test/org/apache/wookie/w3c/test/LocalizedContentTest.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/branches/pluggablepersistence/parser/java/src-test/org/apache/wookie/w3c/test/LocalizedContentTest.java?rev=955946&r1=955945&r2=955946&view=diff
==============================================================================
---
incubator/wookie/branches/pluggablepersistence/parser/java/src-test/org/apache/wookie/w3c/test/LocalizedContentTest.java
(original)
+++
incubator/wookie/branches/pluggablepersistence/parser/java/src-test/org/apache/wookie/w3c/test/LocalizedContentTest.java
Fri Jun 18 11:32:51 2010
@@ -1,3 +1,16 @@
+/*
+ * 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.
+ */
package org.apache.wookie.w3c.test;
import static org.junit.Assert.*;
Modified:
incubator/wookie/branches/pluggablepersistence/parser/java/src/org/apache/wookie/w3c/util/WidgetPackageUtils.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/branches/pluggablepersistence/parser/java/src/org/apache/wookie/w3c/util/WidgetPackageUtils.java?rev=955946&r1=955945&r2=955946&view=diff
==============================================================================
---
incubator/wookie/branches/pluggablepersistence/parser/java/src/org/apache/wookie/w3c/util/WidgetPackageUtils.java
(original)
+++
incubator/wookie/branches/pluggablepersistence/parser/java/src/org/apache/wookie/w3c/util/WidgetPackageUtils.java
Fri Jun 18 11:32:51 2010
@@ -121,25 +121,44 @@ public class WidgetPackageUtils {
return (String[]) content.toArray(new String[content.size()]);
}
- public static File createUnpackedWidgetFolder(File widgetFolder, String
folder) throws IOException{
- folder = convertIdToFolderName(folder);
+ /**
+ * Returns a File representing the unpacked folder for a widget with
the given identifier.
+ * @param widgetFolder the folder that contains unpacked widgets
+ * @param id the widget identifier URI
+ * @return a File where the widget may be unpacked
+ * @throws IOException
+ */
+ public static File createUnpackedWidgetFolder(File widgetFolder, String
id) throws IOException{
+ String folder = convertIdToFolderName(id);
String serverPath = widgetFolder.getPath() + File.separator +
folder;
File file = new File(convertPathToPlatform(serverPath));
return file;
}
- public static String getURLForWidget(String widgetFolder, String
folder, String file){
- folder = convertIdToFolderName(folder);
+ /**
+ * Returns the local URL for a widget
+ * @param widgetFolder the folder that contains unpacked widgets
+ * @param id the widget identifier URI
+ * @param file a file in the widget package; use "" to obtain the root
of the widget folder
+ * @return
+ */
+ public static String getURLForWidget(String widgetFolder, String id,
String file){
+ String folder = convertIdToFolderName(id);
String path = convertPathToRelativeUri(widgetFolder +
File.separator + folder + File.separator + file); //$NON-NLS-1$ //$NON-NLS-2$
return path;
}
- public static String convertIdToFolderName(String folder){
- if(folder.startsWith("http://";)){ //$NON-NLS-1$
- folder = folder.substring(7, folder.length());
+ /**
+ * Converts a widget identifier (usually a URI) into a form suitable
for use as a file system folder name
+ * @param id the widget identifier URI
+ * @return the folder name to use for the widget
+ */
+ public static String convertIdToFolderName(String id){
+ if(id.startsWith("http://";)){ //$NON-NLS-1$
+ id = id.substring(7, id.length());
}
- folder = folder.replaceAll(" ", ""); //$NON-NLS-1$ //$NON-NLS-2$
- return folder;
+ id = id.replaceAll(" ", ""); //$NON-NLS-1$ //$NON-NLS-2$
+ return id;
}
public static String convertPathToRelativeUri(String path){
