Author: al
Date: Tue Dec 3 14:51:43 2013
New Revision: 1547413
URL: http://svn.apache.org/r1547413
Log:
RC4's license changes
These are now fairly minimal.
Modified:
incubator/wave/branches/wave-0.4-release/prosody.cfg.lua.example
incubator/wave/branches/wave-0.4-release/run-server.bat
incubator/wave/branches/wave-0.4-release/src/google/protobuf/descriptor.proto
incubator/wave/branches/wave-0.4-release/src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/color/i18n/ColorPickerMessages_en.properties
incubator/wave/branches/wave-0.4-release/src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/color/i18n/ColorPickerMessages_es.properties
Modified: incubator/wave/branches/wave-0.4-release/prosody.cfg.lua.example
URL:
http://svn.apache.org/viewvc/incubator/wave/branches/wave-0.4-release/prosody.cfg.lua.example?rev=1547413&r1=1547412&r2=1547413&view=diff
==============================================================================
--- incubator/wave/branches/wave-0.4-release/prosody.cfg.lua.example (original)
+++ incubator/wave/branches/wave-0.4-release/prosody.cfg.lua.example Tue Dec 3
14:51:43 2013
@@ -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.
+--]]
+
component_ports = { @XMPP_SERVER_COMPONENT_PORT@ }
s2s_ports = { @XMPP_SERVER_TO_SERVER_PORT@ }
Modified: incubator/wave/branches/wave-0.4-release/run-server.bat
URL:
http://svn.apache.org/viewvc/incubator/wave/branches/wave-0.4-release/run-server.bat?rev=1547413&r1=1547412&r2=1547413&view=diff
==============================================================================
--- incubator/wave/branches/wave-0.4-release/run-server.bat (original)
+++ incubator/wave/branches/wave-0.4-release/run-server.bat Tue Dec 3 14:51:43
2013
@@ -1,4 +1,19 @@
echo off
+rem Licensed to the Apache Software Foundation (ASF) under one or more
+rem contributor license agreements. See the NOTICE file distributed with
+rem this work for additional information regarding copyright ownership.
+rem The ASF licenses this file to You under the Apache License, Version 2.0
+rem (the "License"); you may not use this file except in compliance with
+rem the License. You may obtain a copy of the License at
+rem
+rem http://www.apache.org/licenses/LICENSE-2.0
+rem
+rem Unless required by applicable law or agreed to in writing, software
+rem distributed under the License is distributed on an "AS IS" BASIS,
+rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+rem See the License for the specific language governing permissions and
+rem limitations under the License.
+
if not exist "server.config" (
echo "You need to copy server.config.example to server.config and edit it.
Or run: 'ant -f server-config.xml' to generate the file automatically."
pause
@@ -12,4 +27,4 @@ for /F "tokens=1* delims==" %%A IN (buil
echo on
java -Djava.util.logging.config.file=wiab-logging.conf
-Djava.security.auth.login.config=jaas.config
-Dwave.server.config=server.config -jar
dist/%NAME%-server-%WAVEINABOX_VERSION%.jar
-pause
\ No newline at end of file
+pause
Modified:
incubator/wave/branches/wave-0.4-release/src/google/protobuf/descriptor.proto
URL:
http://svn.apache.org/viewvc/incubator/wave/branches/wave-0.4-release/src/google/protobuf/descriptor.proto?rev=1547413&r1=1547412&r2=1547413&view=diff
==============================================================================
---
incubator/wave/branches/wave-0.4-release/src/google/protobuf/descriptor.proto
(original)
+++
incubator/wave/branches/wave-0.4-release/src/google/protobuf/descriptor.proto
Tue Dec 3 14:51:43 2013
@@ -1,33 +1,20 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc. All rights reserved.
-// http://code.google.com/p/protobuf/
+// 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
//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
+// http://www.apache.org/licenses/LICENSE-2.0
//
-// * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-// * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
+// 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.
//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
// Author: [email protected] (Kenton Varda)
// Based on original Protocol Buffers design by
// Sanjay Ghemawat, Jeff Dean, and others.
Modified:
incubator/wave/branches/wave-0.4-release/src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/color/i18n/ColorPickerMessages_en.properties
URL:
http://svn.apache.org/viewvc/incubator/wave/branches/wave-0.4-release/src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/color/i18n/ColorPickerMessages_en.properties?rev=1547413&r1=1547412&r2=1547413&view=diff
==============================================================================
---
incubator/wave/branches/wave-0.4-release/src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/color/i18n/ColorPickerMessages_en.properties
(original)
+++
incubator/wave/branches/wave-0.4-release/src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/color/i18n/ColorPickerMessages_en.properties
Tue Dec 3 14:51:43 2013
@@ -1,5 +1,26 @@
+#
+#
+# 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.
+#
+#
+
custom = Custom...
none = None
-selectSomeText = Select some text to change the color
\ No newline at end of file
+selectSomeText = Select some text to change the color
Modified:
incubator/wave/branches/wave-0.4-release/src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/color/i18n/ColorPickerMessages_es.properties
URL:
http://svn.apache.org/viewvc/incubator/wave/branches/wave-0.4-release/src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/color/i18n/ColorPickerMessages_es.properties?rev=1547413&r1=1547412&r2=1547413&view=diff
==============================================================================
---
incubator/wave/branches/wave-0.4-release/src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/color/i18n/ColorPickerMessages_es.properties
(original)
+++
incubator/wave/branches/wave-0.4-release/src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/color/i18n/ColorPickerMessages_es.properties
Tue Dec 3 14:51:43 2013
@@ -1,5 +1,26 @@
+#
+#
+# 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.
+#
+#
+
custom = Otro...
none = Ninguno
-selectSomeText = Selecciona un text para cambiarle el color
\ No newline at end of file
+selectSomeText = Selecciona un text para cambiarle el color
