Luis Rodriguez Gonzalez has proposed merging lp:~zorba-coders/zorba/bug-1188041
into lp:zorba/data-formatting-module.
Requested reviews:
Chris Hillery (ceejatec)
Luis Rodriguez Gonzalez (kuraru)
For more details, see:
https://code.launchpad.net/~zorba-coders/zorba/bug-1188041/+merge/183023
--
https://code.launchpad.net/~zorba-coders/zorba/bug-1188041/+merge/183023
Your team Zorba Coders is subscribed to branch lp:zorba/data-formatting-module.
=== removed file 'src/CMakeLists.txt'
--- src/CMakeLists.txt 2011-07-26 10:43:11 +
+++ src/CMakeLists.txt 1970-01-01 00:00:00 +
@@ -1,20 +0,0 @@
-# Copyright 2006-2008 The FLWOR 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.
-
-# all external module libraries are generated in the directory
-# of the corresponding .xq file
-MESSAGE(STATUS "Add com")
-ADD_SUBDIRECTORY(com)
-
-MESSAGE(STATUS "End modules")
=== renamed file 'src/com/zorba-xquery/www/modules/CMakeLists.txt' => 'src/CMakeLists.txt'
--- src/com/zorba-xquery/www/modules/CMakeLists.txt 2013-01-22 13:19:42 +
+++ src/CMakeLists.txt 2013-08-29 20:57:52 +
@@ -76,7 +76,7 @@
INCLUDE_DIRECTORIES (${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
INCLUDE_DIRECTORIES (${JAVA_INCLUDE_PATH})
-DECLARE_ZORBA_MODULE (URI "http://www.zorba-xquery.com/modules/xsl-fo";
+DECLARE_ZORBA_MODULE (URI "http://zorba.io/modules/xsl-fo";
VERSION 1.0 FILE "xsl-fo.xq"
LINK_LIBRARIES "${JAVA_JVM_LIBRARY}" ${zorba_util-jvm_module_LIBRARIES})
=== removed directory 'src/com'
=== removed file 'src/com/CMakeLists.txt'
--- src/com/CMakeLists.txt 2011-10-06 08:17:52 +
+++ src/com/CMakeLists.txt 1970-01-01 00:00:00 +
@@ -1,17 +0,0 @@
-# Copyright 2006-2008 The FLWOR 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.
-
-# all external module libraries are generated in the directory
-# of the corresponding .xq file
-ADD_SUBDIRECTORY(zorba-xquery)
=== removed directory 'src/com/zorba-xquery'
=== removed file 'src/com/zorba-xquery/CMakeLists.txt'
--- src/com/zorba-xquery/CMakeLists.txt 2011-10-06 08:17:52 +
+++ src/com/zorba-xquery/CMakeLists.txt 1970-01-01 00:00:00 +
@@ -1,17 +0,0 @@
-# Copyright 2006-2008 The FLWOR 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.
-
-# all external module libraries are generated in the directory
-# of the corresponding .xq file
-ADD_SUBDIRECTORY(www)
=== removed directory 'src/com/zorba-xquery/www'
=== removed file 'src/com/zorba-xquery/www/CMakeLists.txt'
--- src/com/zorba-xquery/www/CMakeLists.txt 2011-10-06 08:17:52 +
+++ src/com/zorba-xquery/www/CMakeLists.txt 1970-01-01 00:00:00 +
@@ -1,17 +0,0 @@
-# Copyright 2006-2008 The FLWOR 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.
-
-# all external module libraries are generated in the directory
-# of the corresponding .xq file
-ADD_SUBDIRECTORY(modules)
=== removed directory 'src/com/zorba-xquery/www/modules'
=== renamed file 'src/com/zorba-x
