Refs #1577 Fix config files and main message packs locations

2024-12-05 04:38:10 +08:00 · 2012-10-13 09:31:17 +00:00 · 2012-10-13 09:31:17 +00:00 · 8dbca342b6
commit 8dbca342b6
parent 1e8024d971
14 changed files with 76 additions and 20 deletions
--- a/modules/core/src/cuba-app.properties
+++ b/modules/core/src/cuba-app.properties
@ -1,3 +1,9 @@
+#
+# Copyright (c) 2012 Haulmont Technology Ltd. All Rights Reserved.
+# Haulmont Technology proprietary and confidential.
+# Use is subject to license terms.
+#
+
 ###############################################################################
 #                            Names and Directories                            #
 ###############################################################################
--- a/modules/core/src/cuba-mybatis.xml
+++ b/modules/core/src/cuba-mybatis.xml
@ -1,4 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2012 Haulmont Technology Ltd. All Rights Reserved.
+  ~ Haulmont Technology proprietary and confidential.
+  ~ Use is subject to license terms.
+  -->
+
 <!DOCTYPE configuration
        PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-config.dtd">
--- a/modules/core/src/cuba-remoting-spring.xml
+++ b/modules/core/src/cuba-remoting-spring.xml
@ -1,4 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2012 Haulmont Technology Ltd. All Rights Reserved.
+  ~ Haulmont Technology proprietary and confidential.
+  ~ Use is subject to license terms.
+  -->
+
 <beans xmlns="http://www.springframework.org/schema/beans"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xmlns:context="http://www.springframework.org/schema/context"
--- a/modules/core/src/cuba-spring.xml
+++ b/modules/core/src/cuba-spring.xml
@ -1,4 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2012 Haulmont Technology Ltd. All Rights Reserved.
+  ~ Haulmont Technology proprietary and confidential.
+  ~ Use is subject to license terms.
+  -->
+
 <beans xmlns="http://www.springframework.org/schema/beans"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xmlns:context="http://www.springframework.org/schema/context"
--- a/modules/core/src/cuba-views.xml
+++ b/modules/core/src/cuba-views.xml
@ -1,3 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2012 Haulmont Technology Ltd. All Rights Reserved.
+  ~ Haulmont Technology proprietary and confidential.
+  ~ Use is subject to license terms.
+  -->
+
 <views xmlns="http://schemas.haulmont.com/cuba/4.0/view.xsd">

    <view class="com.haulmont.cuba.security.entity.User" name="app">
--- a/modules/desktop/src/cuba-desktop-menu.xml
+++ b/modules/desktop/src/cuba-desktop-menu.xml
@ -1,3 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2012 Haulmont Technology Ltd. All Rights Reserved.
+  ~ Haulmont Technology proprietary and confidential.
+  ~ Use is subject to license terms.
+  -->
+
 <menu-config xmlns="http://schemas.haulmont.com/cuba/4.0/menu.xsd">

    <menu id="administration">
@ -12,8 +19,4 @@
        <item id="sys$ScheduledTask.browse"/>
    </menu>

-    <menu id="reports">
-        <item id="report$Report.run"/>
-    </menu>
-
 </menu-config>
--- a/modules/desktop/src/cuba-desktop-permissions.xml
+++ b/modules/desktop/src/cuba-desktop-permissions.xml
@ -1,5 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2011 Haulmont Technology Ltd. All Rights Reserved.
+  ~ Copyright (c) 2012 Haulmont Technology Ltd. All Rights Reserved.
  ~ Haulmont Technology proprietary and confidential.
  ~ Use is subject to license terms.
  -->
--- a/modules/desktop/src/cuba-desktop-screens.xml
+++ b/modules/desktop/src/cuba-desktop-screens.xml
@ -1,4 +1,11 @@
-<screen-config xmlns="http://www.haulmont.com/schema/cuba/gui/screen-config.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2012 Haulmont Technology Ltd. All Rights Reserved.
+  ~ Haulmont Technology proprietary and confidential.
+  ~ Use is subject to license terms.
+  -->
+
+<screen-config xmlns="http://schemas.haulmont.com/cuba/4.0/screens.xsd">

    <include file="/com/haulmont/cuba/gui/screen-config.xml"/>

--- a/modules/desktop/src/cuba-desktop-spring.xml
+++ b/modules/desktop/src/cuba-desktop-spring.xml
@ -1,4 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2012 Haulmont Technology Ltd. All Rights Reserved.
+  ~ Haulmont Technology proprietary and confidential.
+  ~ Use is subject to license terms.
+  -->
+
 <beans xmlns="http://www.springframework.org/schema/beans"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xmlns:context="http://www.springframework.org/schema/context"
@ -46,7 +52,6 @@
                <entry key="cuba_FileStorageService" value="com.haulmont.cuba.core.app.FileStorageService"/>
                <entry key="cuba_UniqueNumbersService" value="com.haulmont.cuba.core.app.UniqueNumbersService"/>
                <entry key="cuba_LocalizedMessageService" value="com.haulmont.cuba.core.app.LocalizedMessageService"/>
-                <entry key="report_ReportService" value="com.haulmont.cuba.report.app.ReportService"/>
                <entry key="cuba_ResourceService" value="com.haulmont.cuba.core.app.ResourceService"/>
                <entry key="cuba_ScheduledTasksService" value="com.haulmont.cuba.core.app.SchedulingService"/>
                <entry key="cuba_TestingService" value="com.haulmont.cuba.core.app.TestingService"/>
@ -68,7 +73,6 @@
                <value>com.haulmont.cuba.desktop.exception.DeletePolicyHandler</value>
                <value>com.haulmont.cuba.desktop.exception.NumericOverflowExceptionHandler</value>
                <value>com.haulmont.cuba.desktop.exception.OptimisticExceptionHandler</value>
-                <value>com.haulmont.cuba.desktop.exception.ReportExceptionHandler</value>
                <value>com.haulmont.cuba.desktop.exception.FileStorageExceptionHandler</value>
                <value>com.haulmont.cuba.desktop.exception.EntityAccessExceptionHandler</value>
                <value>com.haulmont.cuba.desktop.exception.MssqlDateOutOfRangeExceptionHandler</value>
@ -86,7 +90,7 @@

    <!--

-    For use BackgroundWorker in project add to {app}-desktop-spring.xml this sheduler definition:
+    To use BackgroundWorker in a project add to {app}-desktop-spring.xml this scheduler definition:

    <bean id="backgroundWorkerScheduler" class="org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler">
        <property name="daemon" value="true"/>
--- a/modules/global/src/cuba-credits.xml
+++ b/modules/global/src/cuba-credits.xml
@ -1,5 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2011 Haulmont Technology Ltd. All Rights Reserved.
+  ~ Copyright (c) 2012 Haulmont Technology Ltd. All Rights Reserved.
  ~ Haulmont Technology proprietary and confidential.
  ~ Use is subject to license terms.
  -->
@ -155,12 +156,8 @@ included both in freemarker.jar and in the source code:

        <item name="Apache HttpComponents" web="http://hc.apache.org/" license="apache-2.0"/>

-        <item name="iText" web="http://itextpdf.com/" license="mpl-1.1"/>
-
        <item name="jCIFS" web="http://jcifs.samba.org/" license="lgpl-2.1"/>

-        <item name="JFreeChart" web="http://www.jfree.org/jfreechart/" license="lgpl-2.1"/>
-
        <item name="JGroups" web="http://www.jgroups.org/" license="lgpl-2.1"/>

        <item name="JSON" web="http://json.org/java/">
@ -177,6 +174,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
                    ]]></license>
        </item>

+        <item name="jTDS" web="http://jtds.sourceforge.net/" license="lgpl-3"/>
+
        <item name="JUnit" web="http://www.junit.org/" license="cpl-1.0"/>

        <item name="Apache Log4j" web="http://logging.apache.org/log4j/1.2/" license="apache-2.0"/>
@ -259,8 +258,6 @@ WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGE.]]></license>
        </item>

-        <item name="OpenOffice.org" web="http://www.openoffice.org/" license="lgpl-3"/>
-
        <item name="Google Web Toolkit" web="http://code.google.com/intl/en/webtoolkit/" license="apache-2.0"/>

        <item name="Merlin Hughes Config Framework" web="http://www.ibm.com/developerworks/java/library/j-configint/index.html" license="apache-2.0"/>
--- a/modules/global/src/cuba-metadata.xml
+++ b/modules/global/src/cuba-metadata.xml
@ -1,4 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2012 Haulmont Technology Ltd. All Rights Reserved.
+  ~ Haulmont Technology proprietary and confidential.
+  ~ Use is subject to license terms.
+  -->
+
 <metadata xmlns="http://schemas.haulmont.com/cuba/4.0/metadata.xsd">

    <metadata-model>
--- a/modules/global/src/cuba-persistence.xml
+++ b/modules/global/src/cuba-persistence.xml
@ -1,4 +1,9 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2012 Haulmont Technology Ltd. All Rights Reserved.
+  ~ Haulmont Technology proprietary and confidential.
+  ~ Use is subject to license terms.
+  -->

 <persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
    <persistence-unit name="cuba" transaction-type="RESOURCE_LOCAL">
--- a/modules/portal/src/cuba-portal-security-spring.xml
+++ b/modules/portal/src/cuba-portal-security-spring.xml
@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
  ~ Copyright (c) 2012 Haulmont Technology Ltd. All Rights Reserved.
  ~ Haulmont Technology proprietary and confidential.
--- a/modules/portal/src/cuba-portal-views.xml
+++ b/modules/portal/src/cuba-portal-views.xml
@ -1,10 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
  ~ Copyright (c) 2012 Haulmont Technology Ltd. All Rights Reserved.
  ~ Haulmont Technology proprietary and confidential.
  ~ Use is subject to license terms.
  -->

-<views xmlns="http://schemas.haulmont.com/cuba/3.3/view.xsd">
+<views xmlns="http://schemas.haulmont.com/cuba/4.0/view.xsd">

    <!-- View definitions here -->