Repository: cayenne Updated Branches: refs/heads/master e89e99e6e -> 1fcb8cd89
Modeler: Remove unused resources Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/1fcb8cd8 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/1fcb8cd8 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/1fcb8cd8 Branch: refs/heads/master Commit: 1fcb8cd898f8816da8e61e62b53b7d13b7aaa126 Parents: e89e99e Author: Nikita Timofeev <[email protected]> Authored: Mon Sep 10 15:24:59 2018 +0300 Committer: Nikita Timofeev <[email protected]> Committed: Mon Sep 10 15:24:59 2018 +0300 ---------------------------------------------------------------------- .../cayenne/modeler/dialog/db/templateXML.xml | 34 ------ .../src/main/resources/pref/HSQLNode.driver.xml | 23 ----- .../resources/pref/ModelerPreferences.map.xml | 103 ------------------- .../src/main/resources/pref/Preferences.map.xml | 74 ------------- .../src/main/resources/pref/cayenne.xml | 34 ------ .../src/main/resources/scope.properties | 23 ----- 6 files changed, 291 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/1fcb8cd8/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/dialog/db/templateXML.xml ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/dialog/db/templateXML.xml b/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/dialog/db/templateXML.xml deleted file mode 100644 index fcc2807..0000000 --- a/modeler/cayenne-modeler/src/main/resources/org/apache/cayenne/modeler/dialog/db/templateXML.xml +++ /dev/null @@ -1,34 +0,0 @@ -<!-- - 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. ---> -<reverseEngineering> - <skipRelationshipsLoading>false</skipRelationshipsLoading> - <skipPrimaryKeyLoading>false</skipPrimaryKeyLoading> - <catalog/> - <catalog name=""/> - <catalog name=""> - <includeTable/> - <includeTable pattern=""/> - <includeTable pattern=""> - <includeColumn pattern=""/> - <excludeColumn pattern=""/> - </includeTable> - <excludeTable/> - <excludeTable pattern=""/> - </catalog> -</reverseEngineering> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cayenne/blob/1fcb8cd8/modeler/cayenne-modeler/src/main/resources/pref/HSQLNode.driver.xml ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/resources/pref/HSQLNode.driver.xml b/modeler/cayenne-modeler/src/main/resources/pref/HSQLNode.driver.xml deleted file mode 100644 index ebda77b..0000000 --- a/modeler/cayenne-modeler/src/main/resources/pref/HSQLNode.driver.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - 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. ---> -<driver project-version="3.0.0.1" class="org.hsqldb.jdbcDriver"> - <connectionPool min="1" max="1"/> - <login userName="sa"/> -</driver> http://git-wip-us.apache.org/repos/asf/cayenne/blob/1fcb8cd8/modeler/cayenne-modeler/src/main/resources/pref/ModelerPreferences.map.xml ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/resources/pref/ModelerPreferences.map.xml b/modeler/cayenne-modeler/src/main/resources/pref/ModelerPreferences.map.xml deleted file mode 100644 index a794d7a..0000000 --- a/modeler/cayenne-modeler/src/main/resources/pref/ModelerPreferences.map.xml +++ /dev/null @@ -1,103 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - 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. ---> -<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap http://cayenne.apache.org/schema/3.0/modelMap.xsd"; - project-version="3.0.0.1"> - <property name="defaultLockType" value="optimistic"/> - <property name="defaultPackage" value="org.apache.cayenne.modeler.pref"/> - <property name="defaultSuperclass" value="org.apache.cayenne.pref.PreferenceDetail"/> - <db-entity name="component_geometry"> - <db-attribute name="height" type="INTEGER"/> - <db-attribute name="id" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - <db-attribute name="width" type="INTEGER"/> - <db-attribute name="x" type="INTEGER"/> - <db-attribute name="y" type="INTEGER"/> - </db-entity> - <db-entity name="data_map_defaults"> - <db-attribute name="generate_pairs" type="INTEGER"/> - <db-attribute name="id" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - <db-attribute name="output_path" type="VARCHAR"/> - <db-attribute name="subclass_template" type="VARCHAR"/> - <db-attribute name="superclass_package_suffix" type="VARCHAR"/> - <db-attribute name="superclass_template" type="VARCHAR"/> - </db-entity> - <db-entity name="data_node_defaults"> - <db-attribute name="id" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - <db-attribute name="local_data_source" type="VARCHAR"/> - </db-entity> - <db-entity name="db_connection_info"> - <db-attribute name="db_adapter" type="VARCHAR"/> - <db-attribute name="domain_preference_id" type="INTEGER"/> - <db-attribute name="id" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - <db-attribute name="jdbc_driver" type="VARCHAR"/> - <db-attribute name="password" type="VARCHAR"/> - <db-attribute name="url" type="VARCHAR"/> - <db-attribute name="user_name" type="VARCHAR"/> - </db-entity> - <db-entity name="db_generator_defaults"> - <db-attribute name="create_fk" type="INTEGER"/> - <db-attribute name="create_pk" type="INTEGER"/> - <db-attribute name="create_tables" type="INTEGER"/> - <db-attribute name="drop_pk" type="INTEGER"/> - <db-attribute name="drop_tables" type="INTEGER"/> - <db-attribute name="id" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - </db-entity> - <db-entity name="fs_path"> - <db-attribute name="id" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - <db-attribute name="path" type="VARCHAR"/> - </db-entity> - <obj-entity name="ComponentGeometry" className="org.apache.cayenne.modeler.pref.ComponentGeometry" dbEntityName="component_geometry" superClassName="org.apache.cayenne.pref.PreferenceDetail"> - <obj-attribute name="height" type="java.lang.Integer" db-attribute-path="height"/> - <obj-attribute name="width" type="java.lang.Integer" db-attribute-path="width"/> - <obj-attribute name="x" type="java.lang.Integer" db-attribute-path="x"/> - <obj-attribute name="y" type="java.lang.Integer" db-attribute-path="y"/> - </obj-entity> - <obj-entity name="DBConnectionInfo" className="org.apache.cayenne.modeler.pref.DBConnectionInfo" dbEntityName="db_connection_info" superClassName="org.apache.cayenne.pref.PreferenceDetail"> - <obj-attribute name="dbAdapter" type="java.lang.String" db-attribute-path="db_adapter"/> - <obj-attribute name="domainPreferenceId" type="java.lang.Integer" db-attribute-path="domain_preference_id"/> - <obj-attribute name="jdbcDriver" type="java.lang.String" db-attribute-path="jdbc_driver"/> - <obj-attribute name="password" type="java.lang.String" db-attribute-path="password"/> - <obj-attribute name="url" type="java.lang.String" db-attribute-path="url"/> - <obj-attribute name="userName" type="java.lang.String" db-attribute-path="user_name"/> - </obj-entity> - <obj-entity name="DBGeneratorDefaults" className="org.apache.cayenne.modeler.pref.DBGeneratorDefaults" lock-type="optimistic" dbEntityName="db_generator_defaults" superClassName="org.apache.cayenne.pref.PreferenceDetail"> - <obj-attribute name="createFK" type="java.lang.Boolean" db-attribute-path="create_fk"/> - <obj-attribute name="createPK" type="java.lang.Boolean" db-attribute-path="create_pk"/> - <obj-attribute name="createTables" type="java.lang.Boolean" db-attribute-path="create_tables"/> - <obj-attribute name="dropPK" type="java.lang.Boolean" db-attribute-path="drop_pk"/> - <obj-attribute name="dropTables" type="java.lang.Boolean" db-attribute-path="drop_tables"/> - <post-add method-name="prePersist"/> - </obj-entity> - <obj-entity name="DataMapDefaults" className="org.apache.cayenne.modeler.pref.DataMapDefaults" lock-type="optimistic" dbEntityName="data_map_defaults" superClassName="org.apache.cayenne.pref.PreferenceDetail"> - <obj-attribute name="generatePairs" type="java.lang.Boolean" db-attribute-path="generate_pairs"/> - <obj-attribute name="outputPath" type="java.lang.String" db-attribute-path="output_path"/> - <obj-attribute name="subclassTemplate" type="java.lang.String" db-attribute-path="subclass_template"/> - <obj-attribute name="superclassPackage" type="java.lang.String" db-attribute-path="superclass_package_suffix"/> - <obj-attribute name="superclassTemplate" type="java.lang.String" db-attribute-path="superclass_template"/> - <post-add method-name="prePersist"/> - </obj-entity> - <obj-entity name="DataNodeDefaults" className="org.apache.cayenne.modeler.pref.DataNodeDefaults" lock-type="optimistic" dbEntityName="data_node_defaults" superClassName="org.apache.cayenne.pref.PreferenceDetail"> - <obj-attribute name="localDataSource" type="java.lang.String" db-attribute-path="local_data_source"/> - </obj-entity> - <obj-entity name="FSPath" className="org.apache.cayenne.modeler.pref.FSPath" dbEntityName="fs_path" superClassName="org.apache.cayenne.pref.PreferenceDetail"> - <obj-attribute name="path" type="java.lang.String" db-attribute-path="path"/> - </obj-entity> -</data-map> http://git-wip-us.apache.org/repos/asf/cayenne/blob/1fcb8cd8/modeler/cayenne-modeler/src/main/resources/pref/Preferences.map.xml ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/resources/pref/Preferences.map.xml b/modeler/cayenne-modeler/src/main/resources/pref/Preferences.map.xml deleted file mode 100644 index 3ab3050..0000000 --- a/modeler/cayenne-modeler/src/main/resources/pref/Preferences.map.xml +++ /dev/null @@ -1,74 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - 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. ---> -<data-map xmlns="http://cayenne.apache.org/schema/3.0/modelMap"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://cayenne.apache.org/schema/3.0/modelMap http://cayenne.apache.org/schema/3.0/modelMap.xsd"; - project-version="3.0.0.1"> - <property name="defaultLockType" value="optimistic"/> - <property name="defaultPackage" value="org.apache.cayenne.pref"/> - <db-entity name="domain"> - <db-attribute name="description" type="VARCHAR"/> - <db-attribute name="id" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - <db-attribute name="level" type="INTEGER" isMandatory="true"/> - <db-attribute name="name" type="VARCHAR" isMandatory="true"/> - <db-attribute name="parent_id" type="INTEGER"/> - <db-attribute name="version" type="VARCHAR"/> - </db-entity> - <db-entity name="domain_preference"> - <db-attribute name="domain_id" type="INTEGER" isMandatory="true"/> - <db-attribute name="id" type="INTEGER" isPrimaryKey="true" isMandatory="true"/> - <db-attribute name="key" type="VARCHAR" isMandatory="true"/> - <db-attribute name="key_value_pairs" type="LONGVARCHAR"/> - </db-entity> - <obj-entity name="Domain" className="org.apache.cayenne.pref.Domain" lock-type="optimistic" dbEntityName="domain"> - <obj-attribute name="description" type="java.lang.String" db-attribute-path="description"/> - <obj-attribute name="level" type="java.lang.Integer" db-attribute-path="level"/> - <obj-attribute name="name" type="java.lang.String" db-attribute-path="name"/> - <obj-attribute name="version" type="java.lang.String" db-attribute-path="version"/> - </obj-entity> - <obj-entity name="DomainPreference" className="org.apache.cayenne.pref.DomainPreference" lock-type="optimistic" dbEntityName="domain_preference"> - <obj-attribute name="key" type="java.lang.String" db-attribute-path="key"/> - <obj-attribute name="keyValuePairs" type="java.lang.String" db-attribute-path="key_value_pairs"/> - </obj-entity> - <db-relationship name="parent_domain" source="domain" target="domain" toMany="false"> - <db-attribute-pair source="parent_id" target="id"/> - </db-relationship> - <db-relationship name="preferences" source="domain" target="domain_preference" toMany="true"> - <db-attribute-pair source="id" target="domain_id"/> - </db-relationship> - <db-relationship name="subdomains" source="domain" target="domain" toMany="true"> - <db-attribute-pair source="id" target="parent_id"/> - </db-relationship> - <db-relationship name="domain" source="domain_preference" target="domain" toMany="false"> - <db-attribute-pair source="domain_id" target="id"/> - </db-relationship> - <obj-relationship name="parentDomain" source="Domain" target="Domain" deleteRule="Nullify" db-relationship-path="parent_domain"/> - <obj-relationship name="preferences" source="Domain" target="DomainPreference" deleteRule="Cascade" db-relationship-path="preferences"/> - <obj-relationship name="subdomains" source="Domain" target="Domain" deleteRule="Cascade" db-relationship-path="subdomains"/> - <obj-relationship name="domain" source="DomainPreference" target="Domain" deleteRule="Nullify" db-relationship-path="domain"/> - <query name="DomainPreferenceForKey" type="SelectQuery" root="obj-entity" root-name="DomainPreference"> - <property name="cayenne.GenericSelectQuery.fetchLimit" value="1"/> - <qualifier><![CDATA[(key = $key) and (domain = $domain)]]></qualifier> - <ordering descending="true"><![CDATA[domain.level]]></ordering> - </query> - <query name="TopLevelDomain" type="SelectQuery" root="obj-entity" root-name="Domain"> - <qualifier><![CDATA[(name = $name) and (level = 0)]]></qualifier> - </query> -</data-map> http://git-wip-us.apache.org/repos/asf/cayenne/blob/1fcb8cd8/modeler/cayenne-modeler/src/main/resources/pref/cayenne.xml ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/resources/pref/cayenne.xml b/modeler/cayenne-modeler/src/main/resources/pref/cayenne.xml deleted file mode 100644 index 5ca927c..0000000 --- a/modeler/cayenne-modeler/src/main/resources/pref/cayenne.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - 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. ---> -<domains project-version="3.0.0.1"> -<domain name="CayenneModelerPreferences"> - <property name="cayenne.DataRowStore.snapshot.size" value="1000"/> - - <map name="ModelerPreferences" location="ModelerPreferences.map.xml"/> - <map name="Preferences" location="Preferences.map.xml"/> - - <node name="HSQLNode" - datasource="HSQLNode.driver.xml" - factory="org.apache.cayenne.conf.DriverDataSourceFactory"> - <map-ref name="Preferences"/> - <map-ref name="ModelerPreferences"/> - </node> -</domain> -</domains> http://git-wip-us.apache.org/repos/asf/cayenne/blob/1fcb8cd8/modeler/cayenne-modeler/src/main/resources/scope.properties ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/resources/scope.properties b/modeler/cayenne-modeler/src/main/resources/scope.properties deleted file mode 100644 index 2aefb18..0000000 --- a/modeler/cayenne-modeler/src/main/resources/scope.properties +++ /dev/null @@ -1,23 +0,0 @@ -# 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. - -# ********************************************* -# Scope Framework Configuration -# ********************************************* - - -# StringConverters:
