Author: aadamchik
Date: Tue Sep 19 13:45:31 2006
New Revision: 447960
URL: http://svn.apache.org/viewvc?view=rev&rev=447960
Log:
missing licenses - 2.0
Modified:
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/types.xml
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/cayennemodeler-strings.properties
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/event/DomainDisplayEvent.java
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/pref/DBGeneratorDefaults.java
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/pref/DataMapDefaults.java
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/pref/DataNodeDefaults.java
Modified:
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/types.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/types.xml?view=diff&rev=447960&r1=447959&r2=447960
==============================================================================
---
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/types.xml
(original)
+++
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/cayenne/java/org/apache/cayenne/dba/types.xml
Tue Sep 19 13:45:31 2006
@@ -1,5 +1,24 @@
<?xml version="1.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.
+-->
+
<!--
This file specifies database types mapping to JDBC types.
To create mapping for your own adapter, put a similar file
Modified:
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/cayennemodeler-strings.properties
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/cayennemodeler-strings.properties?view=diff&rev=447960&r1=447959&r2=447960
==============================================================================
---
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/cayennemodeler-strings.properties
(original)
+++
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/cayennemodeler-strings.properties
Tue Sep 19 13:45:31 2006
@@ -1,3 +1,20 @@
+// 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.
+
cayenne.version = @CAYENNE_VERSION@
cayenne.build.date = @CAYENNE_BUILD_DATE@
Modified:
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/event/DomainDisplayEvent.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/event/DomainDisplayEvent.java?view=diff&rev=447960&r1=447959&r2=447960
==============================================================================
---
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/event/DomainDisplayEvent.java
(original)
+++
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/event/DomainDisplayEvent.java
Tue Sep 19 13:45:31 2006
@@ -1,4 +1,3 @@
-package org.apache.cayenne.modeler.event;
/*****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -17,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-
+package org.apache.cayenne.modeler.event;
import org.apache.cayenne.access.DataDomain;
Modified:
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/pref/DBGeneratorDefaults.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/pref/DBGeneratorDefaults.java?view=diff&rev=447960&r1=447959&r2=447960
==============================================================================
---
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/pref/DBGeneratorDefaults.java
(original)
+++
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/pref/DBGeneratorDefaults.java
Tue Sep 19 13:45:31 2006
@@ -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.
+ ****************************************************************/
+
package org.apache.cayenne.modeler.pref;
import org.apache.cayenne.PersistenceState;
@@ -6,45 +25,49 @@
public class DBGeneratorDefaults extends _DBGeneratorDefaults {
- /**
- * Updates this object state to provide reasonable defaults for a given
adapter.
- */
- public void adjustForAdapter(DbAdapter adapter) {
- if (!adapter.supportsFkConstraints()
- && booleanForBooleanProperty(CREATE_FK_PROPERTY)) {
- setCreateFK(Boolean.FALSE);
- }
- }
-
- /**
- * Updates DbGenerator settings, consulting its own state.
- */
- public void configureGenerator(DbGenerator generator) {
- generator
-
.setShouldCreateFKConstraints(booleanForBooleanProperty(CREATE_FK_PROPERTY));
-
generator.setShouldCreatePKSupport(booleanForBooleanProperty(CREATE_PK_PROPERTY));
- generator
-
.setShouldCreateTables(booleanForBooleanProperty(CREATE_TABLES_PROPERTY));
-
generator.setShouldDropPKSupport(booleanForBooleanProperty(DROP_PK_PROPERTY));
-
generator.setShouldDropTables(booleanForBooleanProperty(DROP_TABLES_PROPERTY));
- }
-
- public void setPersistenceState(int persistenceState) {
-
- // init defaults on insert...
- if (this.persistenceState == PersistenceState.TRANSIENT
- && persistenceState == PersistenceState.NEW) {
- setCreateFK(Boolean.TRUE);
- setCreatePK(Boolean.TRUE);
- setCreateTables(Boolean.TRUE);
- setDropPK(Boolean.FALSE);
- setDropTables(Boolean.FALSE);
- }
- super.setPersistenceState(persistenceState);
- }
-
- protected boolean booleanForBooleanProperty(String property) {
- Boolean b = (Boolean) readProperty(property);
- return (b != null) ? b.booleanValue() : false;
- }
+ /**
+ * Updates this object state to provide reasonable defaults for a given
+ * adapter.
+ */
+ public void adjustForAdapter(DbAdapter adapter) {
+ if (!adapter.supportsFkConstraints()
+ &&
booleanForBooleanProperty(CREATE_FK_PROPERTY)) {
+ setCreateFK(Boolean.FALSE);
+ }
+ }
+
+ /**
+ * Updates DbGenerator settings, consulting its own state.
+ */
+ public void configureGenerator(DbGenerator generator) {
+ generator
+
.setShouldCreateFKConstraints(booleanForBooleanProperty(CREATE_FK_PROPERTY));
+ generator
+
.setShouldCreatePKSupport(booleanForBooleanProperty(CREATE_PK_PROPERTY));
+ generator
+
.setShouldCreateTables(booleanForBooleanProperty(CREATE_TABLES_PROPERTY));
+ generator
+
.setShouldDropPKSupport(booleanForBooleanProperty(DROP_PK_PROPERTY));
+ generator
+
.setShouldDropTables(booleanForBooleanProperty(DROP_TABLES_PROPERTY));
+ }
+
+ public void setPersistenceState(int persistenceState) {
+
+ // init defaults on insert...
+ if (this.persistenceState == PersistenceState.TRANSIENT
+ && persistenceState == PersistenceState.NEW) {
+ setCreateFK(Boolean.TRUE);
+ setCreatePK(Boolean.TRUE);
+ setCreateTables(Boolean.TRUE);
+ setDropPK(Boolean.FALSE);
+ setDropTables(Boolean.FALSE);
+ }
+ super.setPersistenceState(persistenceState);
+ }
+
+ protected boolean booleanForBooleanProperty(String property) {
+ Boolean b = (Boolean) readProperty(property);
+ return (b != null) ? b.booleanValue() : false;
+ }
}
Modified:
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/pref/DataMapDefaults.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/pref/DataMapDefaults.java?view=diff&rev=447960&r1=447959&r2=447960
==============================================================================
---
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/pref/DataMapDefaults.java
(original)
+++
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/pref/DataMapDefaults.java
Tue Sep 19 13:45:31 2006
@@ -1,3 +1,21 @@
+/*****************************************************************
+ * 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.
+ ****************************************************************/
package org.apache.cayenne.modeler.pref;
import org.apache.cayenne.PersistenceState;
@@ -6,70 +24,67 @@
public class DataMapDefaults extends _DataMapDefaults {
- public static final String DEFAULT_SUPERCLASS_PACKAGE_SUFFIX = "auto";
+ public static final String DEFAULT_SUPERCLASS_PACKAGE_SUFFIX = "auto";
- /**
- * Returns a superlcass package tailored for a given DataMap.
- */
- public void updateSuperclassPackage(DataMap dataMap, boolean isClient) {
-
- String storedPackage = super.getSuperclassPackage();
- if (Util.isEmptyString(storedPackage)
- || DEFAULT_SUPERCLASS_PACKAGE_SUFFIX.equals(storedPackage)) {
- String mapPackage = (isClient) ? dataMap.getDefaultClientPackage()
: dataMap
- .getDefaultPackage();
- if (!Util.isEmptyString(mapPackage)) {
-
- if (mapPackage.endsWith(".")) {
- mapPackage = mapPackage.substring(mapPackage.length() - 1);
- }
-
- if (!Util.isEmptyString(mapPackage)) {
- String newPackage = mapPackage
- + "."
- + DEFAULT_SUPERCLASS_PACKAGE_SUFFIX;
- if (!Util.nullSafeEquals(newPackage, storedPackage)) {
- setSuperclassPackage(newPackage);
- }
- }
- }
- }
-
- if (DEFAULT_SUPERCLASS_PACKAGE_SUFFIX.equals(getSuperclassPackage())) {
- setSuperclassPackage(null);
- }
- }
-
- public void setPersistenceState(int persistenceState) {
-
- // init defaults on insert...
- if (this.persistenceState == PersistenceState.TRANSIENT
- && persistenceState == PersistenceState.NEW) {
- setGeneratePairs(Boolean.TRUE);
- }
- super.setPersistenceState(persistenceState);
- }
-
- /**
- * Sets superclass package, building it by "normalizing" and concatenating
prefix and
- * suffix.
- */
- public void setSuperclassPackage(String prefix, String suffix) {
- if (prefix == null) {
- prefix = "";
- }
- else if (prefix.endsWith(".")) {
- prefix = prefix.substring(0, prefix.length() - 1);
- }
-
- if (suffix == null) {
- suffix = "";
- }
- else if (suffix.startsWith(".")) {
- suffix = suffix.substring(1);
- }
-
- String dot = (suffix.length() > 0 && prefix.length() > 0) ? "." : "";
- setSuperclassPackage(prefix + dot + suffix);
- }
+ /**
+ * Returns a superlcass package tailored for a given DataMap.
+ */
+ public void updateSuperclassPackage(DataMap dataMap, boolean isClient) {
+
+ String storedPackage = super.getSuperclassPackage();
+ if (Util.isEmptyString(storedPackage)
+ ||
DEFAULT_SUPERCLASS_PACKAGE_SUFFIX.equals(storedPackage)) {
+ String mapPackage = (isClient) ?
dataMap.getDefaultClientPackage()
+ : dataMap.getDefaultPackage();
+ if (!Util.isEmptyString(mapPackage)) {
+
+ if (mapPackage.endsWith(".")) {
+ mapPackage =
mapPackage.substring(mapPackage.length() - 1);
+ }
+
+ if (!Util.isEmptyString(mapPackage)) {
+ String newPackage = mapPackage + "."
+ +
DEFAULT_SUPERCLASS_PACKAGE_SUFFIX;
+ if (!Util.nullSafeEquals(newPackage,
storedPackage)) {
+
setSuperclassPackage(newPackage);
+ }
+ }
+ }
+ }
+
+ if
(DEFAULT_SUPERCLASS_PACKAGE_SUFFIX.equals(getSuperclassPackage())) {
+ setSuperclassPackage(null);
+ }
+ }
+
+ public void setPersistenceState(int persistenceState) {
+
+ // init defaults on insert...
+ if (this.persistenceState == PersistenceState.TRANSIENT
+ && persistenceState == PersistenceState.NEW) {
+ setGeneratePairs(Boolean.TRUE);
+ }
+ super.setPersistenceState(persistenceState);
+ }
+
+ /**
+ * Sets superclass package, building it by "normalizing" and
concatenating
+ * prefix and suffix.
+ */
+ public void setSuperclassPackage(String prefix, String suffix) {
+ if (prefix == null) {
+ prefix = "";
+ } else if (prefix.endsWith(".")) {
+ prefix = prefix.substring(0, prefix.length() - 1);
+ }
+
+ if (suffix == null) {
+ suffix = "";
+ } else if (suffix.startsWith(".")) {
+ suffix = suffix.substring(1);
+ }
+
+ String dot = (suffix.length() > 0 && prefix.length() > 0) ? "."
: "";
+ setSuperclassPackage(prefix + dot + suffix);
+ }
}
Modified:
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/pref/DataNodeDefaults.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/pref/DataNodeDefaults.java?view=diff&rev=447960&r1=447959&r2=447960
==============================================================================
---
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/pref/DataNodeDefaults.java
(original)
+++
incubator/cayenne/main/branches/STABLE-2.0/cayenne/cayenne-java/src/modeler/java/org/apache/cayenne/modeler/pref/DataNodeDefaults.java
Tue Sep 19 13:45:31 2006
@@ -1,9 +1,23 @@
+/*****************************************************************
+ * 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.
+ ****************************************************************/
package org.apache.cayenne.modeler.pref;
-
public class DataNodeDefaults extends _DataNodeDefaults {
}
-
-
-
