You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devicemap.apache.org by bd...@apache.org on 2013/02/15 16:06:50 UTC

svn commit: r1446623 - in /incubator/devicemap/trunk: ./ openddr/data/src/main/resources/devicedata/

Author: bdelacretaz
Date: Fri Feb 15 15:06:50 2013
New Revision: 1446623

URL: http://svn.apache.org/r1446623
Log:
DMAP-11 - add Apache license to data files and add CREDITS.txt for OpenDDR credits

Added:
    incubator/devicemap/trunk/CREDITS.txt   (with props)
Modified:
    incubator/devicemap/trunk/openddr/data/src/main/resources/devicedata/BrowserDataSource.xml
    incubator/devicemap/trunk/openddr/data/src/main/resources/devicedata/BuilderDataSource.xml
    incubator/devicemap/trunk/openddr/data/src/main/resources/devicedata/BuilderDataSourcePatch.xml
    incubator/devicemap/trunk/openddr/data/src/main/resources/devicedata/DeviceDataSource.xml
    incubator/devicemap/trunk/openddr/data/src/main/resources/devicedata/DeviceDataSourcePatch.xml
    incubator/devicemap/trunk/openddr/data/src/main/resources/devicedata/OperatingSystemDataSource.xml
    incubator/devicemap/trunk/openddr/data/src/main/resources/devicedata/coreVocabulary.xml
    incubator/devicemap/trunk/openddr/data/src/main/resources/devicedata/oddrLimitedVocabulary.xml
    incubator/devicemap/trunk/openddr/data/src/main/resources/devicedata/oddrVocabulary.xml

Added: incubator/devicemap/trunk/CREDITS.txt
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/CREDITS.txt?rev=1446623&view=auto
==============================================================================
--- incubator/devicemap/trunk/CREDITS.txt (added)
+++ incubator/devicemap/trunk/CREDITS.txt Fri Feb 15 15:06:50 2013
@@ -0,0 +1,11 @@
+Apache DeviceMap credits
+========================
+
+The initial device data was donated by OpenDDR LLC, represented by Werner Keil,
+the original copyright notice is as follows:
+
+  Copyright 2011 OpenDDR LLC
+  This file is made available under the terms of the Open Database 
+  License: http://opendatacommons.org/licenses/odbl/1.0/.
+  Any rights in individual contents of the database are licensed under the 
+  Database Contents License: http://opendatacommons.org/licenses/dbcl/1.0/

Propchange: incubator/devicemap/trunk/CREDITS.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/devicemap/trunk/openddr/data/src/main/resources/devicedata/BrowserDataSource.xml
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/data/src/main/resources/devicedata/BrowserDataSource.xml?rev=1446623&r1=1446622&r2=1446623&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/data/src/main/resources/devicedata/BrowserDataSource.xml (original)
+++ incubator/devicemap/trunk/openddr/data/src/main/resources/devicedata/BrowserDataSource.xml Fri Feb 15 15:06:50 2013
@@ -1,20 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+    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.
+-->
 <ODDR>
     <version>
         <ver>1.15</ver>
         <last_updated>2013-01-30 09:30:00</last_updated>
-        <official_url>openddr.org</official_url>
-        <maintainers>
-        </maintainers>
-        <authors>
-        </authors>
-        <statement>
-		     <![CDATA[ 
-				Copyright 2011 OpenDDR LLC
-		This file is made available under the terms of the Open Database License: http://opendatacommons.org/licenses/odbl/1.0/. 
-		Any rights in individual contents of the database are licensed under the Database Contents License: http://opendatacommons.org/licenses/dbcl/1.0/
-		]]>
-        </statement>
+        <official_url>http://incubator.apache.org/devicemap</official_url>
+        <maintainers></maintainers>
+        <authors></authors>
+        <statement>Licensed under http://www.apache.org/licenses/LICENSE-2.0</statement>
     </version>
     <Browsers>
         <browser id="Apple.Mobile Safari.1.0.0.0">

Modified: incubator/devicemap/trunk/openddr/data/src/main/resources/devicedata/BuilderDataSource.xml
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/data/src/main/resources/devicedata/BuilderDataSource.xml?rev=1446623&r1=1446622&r2=1446623&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/data/src/main/resources/devicedata/BuilderDataSource.xml (original)
+++ incubator/devicemap/trunk/openddr/data/src/main/resources/devicedata/BuilderDataSource.xml Fri Feb 15 15:06:50 2013
@@ -1,20 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+    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.
+-->
 <ODDR>
     <version>
         <ver>1.15</ver>
         <last_updated>2013-01-30 09:31:00</last_updated>
-        <official_url>openddr.org</official_url>
-        <maintainers>
-        </maintainers>
-        <authors>
-        </authors>
-        <statement>
-		     <![CDATA[
-				Copyright 2011 OpenDDR LLC
-		This file is made available under the terms of the Open Database License: http://opendatacommons.org/licenses/odbl/1.0/.
-		Any rights in individual contents of the database are licensed under the Database Contents License: http://opendatacommons.org/licenses/dbcl/1.0/
-		]]>
-        </statement>
+        <official_url>http://incubator.apache.org/devicemap</official_url>
+        <maintainers></maintainers>
+        <authors></authors>
+        <statement>Licensed under http://www.apache.org/licenses/LICENSE-2.0</statement>
     </version>
     <Builders>
         <builder class="org.openddr.simpleapi.oddr.builder.device.AndroidDeviceBuilder">

Modified: incubator/devicemap/trunk/openddr/data/src/main/resources/devicedata/BuilderDataSourcePatch.xml
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/data/src/main/resources/devicedata/BuilderDataSourcePatch.xml?rev=1446623&r1=1446622&r2=1446623&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/data/src/main/resources/devicedata/BuilderDataSourcePatch.xml (original)
+++ incubator/devicemap/trunk/openddr/data/src/main/resources/devicedata/BuilderDataSourcePatch.xml Fri Feb 15 15:06:50 2013
@@ -1,20 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+    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.
+-->
 <ODDR>
     <version>
         <ver>1.15</ver>
         <last_updated>2013-01-30 09:31:00</last_updated>
-        <official_url>openddr.org</official_url>
-        <maintainers>
-        </maintainers>
-        <authors>
-        </authors>
-        <statement>
-		     <![CDATA[
-				Copyright 2011 OpenDDR LLC
-		This file is made available under the terms of the Open Database License: http://opendatacommons.org/licenses/odbl/1.0/.
-		Any rights in individual contents of the database are licensed under the Database Contents License: http://opendatacommons.org/licenses/dbcl/1.0/
-		]]>
-        </statement>
+        <official_url>http://incubator.apache.org/devicemap</official_url>
+        <maintainers></maintainers>
+        <authors></authors>
+        <statement>Licensed under http://www.apache.org/licenses/LICENSE-2.0</statement>
     </version>
     <Builders>
         <builder class="org.openddr.simpleapi.oddr.builder.device.AndroidDeviceBuilder">

Modified: incubator/devicemap/trunk/openddr/data/src/main/resources/devicedata/DeviceDataSource.xml
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/data/src/main/resources/devicedata/DeviceDataSource.xml?rev=1446623&r1=1446622&r2=1446623&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/data/src/main/resources/devicedata/DeviceDataSource.xml (original)
+++ incubator/devicemap/trunk/openddr/data/src/main/resources/devicedata/DeviceDataSource.xml Fri Feb 15 15:06:50 2013
@@ -1,16 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+    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.
+-->         
 <ODDR>
   <version>
     <ver>1.15</ver>
     <last_updated>2013-01-30 09:31:00</last_updated>
-    
-    <official_url>openddr.org</official_url>
+    <official_url>http://incubator.apache.org/devicemap</official_url>
     <maintainers></maintainers>
     <authors></authors>
-    <statement> 
-				Copyright 2011 OpenDDR LLC
-		This file is made available under the terms of the Open Database License: http://opendatacommons.org/licenses/odbl/1.0/. 
-		Any rights in individual contents of the database are licensed under the Database Contents License: http://opendatacommons.org/licenses/dbcl/1.0/
-		</statement>
+    <statement>Licensed under http://www.apache.org/licenses/LICENSE-2.0</statement>
   </version>
 <Devices>
     <device id="SAMSUNG-SGH-i780" parentId="genericSamsung">

Modified: incubator/devicemap/trunk/openddr/data/src/main/resources/devicedata/DeviceDataSourcePatch.xml
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/data/src/main/resources/devicedata/DeviceDataSourcePatch.xml?rev=1446623&r1=1446622&r2=1446623&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/data/src/main/resources/devicedata/DeviceDataSourcePatch.xml (original)
+++ incubator/devicemap/trunk/openddr/data/src/main/resources/devicedata/DeviceDataSourcePatch.xml Fri Feb 15 15:06:50 2013
@@ -1,20 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+    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.
+-->         
 <ODDR>
     <version>
         <ver>1.15</ver>
         <last_updated>2013-01-30 09:30:00</last_updated>
-        <official_url>openddr.org</official_url>
-        <maintainers>
-        </maintainers>
-        <authors>
-        </authors>
-        <statement>
-		     <![CDATA[
-				Copyright 2011 OpenDDR LLC
-		This file is made available under the terms of the Open Database License: http://opendatacommons.org/licenses/odbl/1.0/.
-		Any rights in individual contents of the database are licensed under the Database Contents License: http://opendatacommons.org/licenses/dbcl/1.0/
-		]]>
-        </statement>
+        <official_url>http://incubator.apache.org/devicemap</official_url>
+        <maintainers></maintainers>
+        <authors></authors>
+        <statement>Licensed under http://www.apache.org/licenses/LICENSE-2.0</statement>
     </version>
     <Devices>
         <device id="desktopDevice" parentId="generic-">

Modified: incubator/devicemap/trunk/openddr/data/src/main/resources/devicedata/OperatingSystemDataSource.xml
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/data/src/main/resources/devicedata/OperatingSystemDataSource.xml?rev=1446623&r1=1446622&r2=1446623&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/data/src/main/resources/devicedata/OperatingSystemDataSource.xml (original)
+++ incubator/devicemap/trunk/openddr/data/src/main/resources/devicedata/OperatingSystemDataSource.xml Fri Feb 15 15:06:50 2013
@@ -1,20 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+    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.
+-->         
 <ODDR>
     <version>
         <ver>1.15</ver>
         <last_updated>2013-01-30 09:31:00</last_updated>
-        <official_url>openddr.org</official_url>
-        <maintainers>
-        </maintainers>
-        <authors>
-        </authors>
-        <statement>
-		     <![CDATA[ 
-				Copyright 2011 OpenDDR LLC
-		This file is made available under the terms of the Open Database License: http://opendatacommons.org/licenses/odbl/1.0/. 
-		Any rights in individual contents of the database are licensed under the Database Contents License: http://opendatacommons.org/licenses/dbcl/1.0/
-		]]>
-        </statement>
+        <official_url>http://incubator.apache.org/devicemap</official_url>
+        <maintainers></maintainers>
+        <authors></authors>
+        <statement>Licensed under http://www.apache.org/licenses/LICENSE-2.0</statement>
     </version>
     <OperatingSystem>
         <operatingSystem id="Apple.iOS.1.0.0.0">

Modified: incubator/devicemap/trunk/openddr/data/src/main/resources/devicedata/coreVocabulary.xml
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/data/src/main/resources/devicedata/coreVocabulary.xml?rev=1446623&r1=1446622&r2=1446623&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/data/src/main/resources/devicedata/coreVocabulary.xml (original)
+++ incubator/devicemap/trunk/openddr/data/src/main/resources/devicedata/coreVocabulary.xml Fri Feb 15 15:06:50 2013
@@ -1,20 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+    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.
+-->         
 <ODDR>
     <version>
         <ver>1.15</ver>
         <last_updated>2013-01-30 09:30:00</last_updated>
-        <official_url>openddr.org</official_url>
-        <maintainers>
-        </maintainers>
-        <authors>
-        </authors>
-        <statement>
-        <![CDATA[
-        Copyright 2011 OpenDDR LLC
-        This file is made available under the terms of the Open Database License: http://opendatacommons.org/licenses/odbl/1.0/.
-        Any rights in individual contents of the database are licensed under the Database Contents License: http://opendatacommons.org/licenses/dbcl/1.0/
-        ]]>
-        </statement>
+        <official_url>http://incubator.apache.org/devicemap</official_url>
+        <maintainers></maintainers>
+        <authors></authors>
+        <statement>Licensed under http://www.apache.org/licenses/LICENSE-2.0</statement>
     </version>
 <!-- DDR Core Vocabulary description -->
     <VocabularyDescription target="http://www.w3.org/2008/01/ddr-core-vocabulary">
@@ -39,4 +47,4 @@
             <Property name="scriptSupport" datatype="xs:enumeration" aspects="webBrowser" defaultAspect="webBrowser"/>
         </Properties>
     </VocabularyDescription>
-</ODDR>
\ No newline at end of file
+</ODDR>

Modified: incubator/devicemap/trunk/openddr/data/src/main/resources/devicedata/oddrLimitedVocabulary.xml
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/data/src/main/resources/devicedata/oddrLimitedVocabulary.xml?rev=1446623&r1=1446622&r2=1446623&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/data/src/main/resources/devicedata/oddrLimitedVocabulary.xml (original)
+++ incubator/devicemap/trunk/openddr/data/src/main/resources/devicedata/oddrLimitedVocabulary.xml Fri Feb 15 15:06:50 2013
@@ -1,20 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+    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.
+-->         
 <ODDR>
     <version>
         <ver>1.15</ver>
         <last_updated>2013-01-30 09:30:00</last_updated>
-        <official_url>openddr.org</official_url>
-        <maintainers>
-        </maintainers>
-        <authors>
-        </authors>
-        <statement>
-		     <![CDATA[ 
-				Copyright 2011 OpenDDR LLC
-		This file is made available under the terms of the Open Database License: http://opendatacommons.org/licenses/odbl/1.0/. 
-		Any rights in individual contents of the database are licensed under the Database Contents License: http://opendatacommons.org/licenses/dbcl/1.0/
-		]]>
-        </statement>
+        <official_url>http://incubator.apache.org/devicemap</official_url>
+        <maintainers></maintainers>
+        <authors></authors>
+        <statement>Licensed under http://www.apache.org/licenses/LICENSE-2.0</statement>
     </version>
 <!-- DDR Core Vocabulary description -->
     <VocabularyDescription target="http://www.w3.org/2008/01/ddr-core-vocabulary">
@@ -52,4 +60,4 @@
             <Property name="from" datatype="xs:string" aspects="device" defaultAspect="device"/>
         </Properties>
     </VocabularyDescription>
-</ODDR>
\ No newline at end of file
+</ODDR>

Modified: incubator/devicemap/trunk/openddr/data/src/main/resources/devicedata/oddrVocabulary.xml
URL: http://svn.apache.org/viewvc/incubator/devicemap/trunk/openddr/data/src/main/resources/devicedata/oddrVocabulary.xml?rev=1446623&r1=1446622&r2=1446623&view=diff
==============================================================================
--- incubator/devicemap/trunk/openddr/data/src/main/resources/devicedata/oddrVocabulary.xml (original)
+++ incubator/devicemap/trunk/openddr/data/src/main/resources/devicedata/oddrVocabulary.xml Fri Feb 15 15:06:50 2013
@@ -1,20 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+    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.
+-->         
 <ODDR>
     <version>
         <ver>1.15</ver>
         <last_updated>2013-01-30 09:31:00</last_updated>
-        <official_url>openddr.org</official_url>
-        <maintainers>
-        </maintainers>
-        <authors>
-        </authors>
-        <statement>
-        <![CDATA[
-        Copyright 2011 OpenDDR LLC
-        This file is made available under the terms of the Open Database License: http://opendatacommons.org/licenses/odbl/1.0/.
-        Any rights in individual contents of the database are licensed under the Database Contents License: http://opendatacommons.org/licenses/dbcl/1.0/
-        ]]>
-        </statement>
+        <official_url>http://incubator.apache.org/devicemap</official_url>
+        <maintainers></maintainers>
+        <authors></authors>
+        <statement>Licensed under http://www.apache.org/licenses/LICENSE-2.0</statement>
     </version>
     <!-- ODDR Vocabulary description -->
     <VocabularyDescription target="http://www.openddr.org/oddr-vocabulary">