You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by si...@apache.org on 2009/10/05 23:21:55 UTC
svn commit: r822022 [3/11] - in /labs/magma/branches/0.0.2: ./
beans-richtext/ beans-richtext/src/main/java/org/apache/magma/beans/
beans-richtext/src/main/java/org/apache/magma/beans/richtext/
beans-richtext/src/main/java/org/apache/magma/conversion/r...
Modified: labs/magma/branches/0.0.2/foundation-beans/src/main/java/org/apache/magma/conversion/string/BigDecimalConverter.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-beans/src/main/java/org/apache/magma/conversion/string/BigDecimalConverter.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-beans/src/main/java/org/apache/magma/conversion/string/BigDecimalConverter.java (original)
+++ labs/magma/branches/0.0.2/foundation-beans/src/main/java/org/apache/magma/conversion/string/BigDecimalConverter.java Mon Oct 5 21:21:39 2009
@@ -1,3 +1,19 @@
+/*
+ * 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.magma.conversion.string;
import java.math.BigDecimal;
Propchange: labs/magma/branches/0.0.2/foundation-beans/src/main/java/org/apache/magma/conversion/string/BigDecimalConverter.java
('svn:mergeinfo' removed)
Modified: labs/magma/branches/0.0.2/foundation-beans/src/main/java/org/apache/magma/conversion/string/BigIntegerConverter.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-beans/src/main/java/org/apache/magma/conversion/string/BigIntegerConverter.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-beans/src/main/java/org/apache/magma/conversion/string/BigIntegerConverter.java (original)
+++ labs/magma/branches/0.0.2/foundation-beans/src/main/java/org/apache/magma/conversion/string/BigIntegerConverter.java Mon Oct 5 21:21:39 2009
@@ -1,3 +1,19 @@
+/*
+ * 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.magma.conversion.string;
import java.math.BigInteger;
Propchange: labs/magma/branches/0.0.2/foundation-beans/src/main/java/org/apache/magma/conversion/string/BigIntegerConverter.java
('svn:mergeinfo' removed)
Propchange: labs/magma/branches/0.0.2/foundation-beans/src/main/java/org/apache/magma/conversion/string/BooleanConverter.java
('svn:mergeinfo' removed)
Modified: labs/magma/branches/0.0.2/foundation-beans/src/main/java/org/apache/magma/conversion/string/ByteConverter.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-beans/src/main/java/org/apache/magma/conversion/string/ByteConverter.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-beans/src/main/java/org/apache/magma/conversion/string/ByteConverter.java (original)
+++ labs/magma/branches/0.0.2/foundation-beans/src/main/java/org/apache/magma/conversion/string/ByteConverter.java Mon Oct 5 21:21:39 2009
@@ -1,3 +1,19 @@
+/*
+ * 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.magma.conversion.string;
import org.apache.magma.basics.LocalizableString;
Propchange: labs/magma/branches/0.0.2/foundation-beans/src/main/java/org/apache/magma/conversion/string/ByteConverter.java
('svn:mergeinfo' removed)
Propchange: labs/magma/branches/0.0.2/foundation-beans/src/main/java/org/apache/magma/conversion/string/ClassConverter.java
('svn:mergeinfo' removed)
Propchange: labs/magma/branches/0.0.2/foundation-beans/src/main/java/org/apache/magma/conversion/string/DateConverter.java
('svn:mergeinfo' removed)
Propchange: labs/magma/branches/0.0.2/foundation-beans/src/main/java/org/apache/magma/conversion/string/DoubleConverter.java
('svn:mergeinfo' removed)
Propchange: labs/magma/branches/0.0.2/foundation-beans/src/main/java/org/apache/magma/conversion/string/EnumConverter.java
('svn:mergeinfo' removed)
Modified: labs/magma/branches/0.0.2/foundation-beans/src/main/java/org/apache/magma/conversion/string/FloatConverter.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-beans/src/main/java/org/apache/magma/conversion/string/FloatConverter.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-beans/src/main/java/org/apache/magma/conversion/string/FloatConverter.java (original)
+++ labs/magma/branches/0.0.2/foundation-beans/src/main/java/org/apache/magma/conversion/string/FloatConverter.java Mon Oct 5 21:21:39 2009
@@ -1,3 +1,19 @@
+/*
+ * 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.magma.conversion.string;
import org.apache.magma.basics.LocalizableString;
Propchange: labs/magma/branches/0.0.2/foundation-beans/src/main/java/org/apache/magma/conversion/string/FloatConverter.java
('svn:mergeinfo' removed)
Propchange: labs/magma/branches/0.0.2/foundation-beans/src/main/java/org/apache/magma/conversion/string/IntegerConverter.java
('svn:mergeinfo' removed)
Propchange: labs/magma/branches/0.0.2/foundation-beans/src/main/java/org/apache/magma/conversion/string/LongConverter.java
('svn:mergeinfo' removed)
Propchange: labs/magma/branches/0.0.2/foundation-beans/src/main/java/org/apache/magma/conversion/string/PrimitiveTypeConverter.java
('svn:mergeinfo' removed)
Modified: labs/magma/branches/0.0.2/foundation-beans/src/main/java/org/apache/magma/conversion/string/ShortConverter.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-beans/src/main/java/org/apache/magma/conversion/string/ShortConverter.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-beans/src/main/java/org/apache/magma/conversion/string/ShortConverter.java (original)
+++ labs/magma/branches/0.0.2/foundation-beans/src/main/java/org/apache/magma/conversion/string/ShortConverter.java Mon Oct 5 21:21:39 2009
@@ -1,3 +1,19 @@
+/*
+ * 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.magma.conversion.string;
import org.apache.magma.basics.LocalizableString;
Propchange: labs/magma/branches/0.0.2/foundation-beans/src/main/java/org/apache/magma/conversion/string/ShortConverter.java
('svn:mergeinfo' removed)
Propchange: labs/magma/branches/0.0.2/foundation-beans/src/main/java/org/apache/magma/conversion/string/StringConverter.java
('svn:mergeinfo' removed)
Propchange: labs/magma/branches/0.0.2/foundation-beans/src/main/java/org/apache/magma/conversion/utils/
('svn:mergeinfo' removed)
Propchange: labs/magma/branches/0.0.2/foundation-beans/src/main/resources/META-INF/
('svn:mergeinfo' removed)
Modified: labs/magma/branches/0.0.2/foundation-beans/src/main/resources/META-INF/magma.default.properties
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-beans/src/main/resources/META-INF/magma.default.properties?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-beans/src/main/resources/META-INF/magma.default.properties (original)
+++ labs/magma/branches/0.0.2/foundation-beans/src/main/resources/META-INF/magma.default.properties Mon Oct 5 21:21:39 2009
@@ -1,3 +1,17 @@
+#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.
org.apache.magma.conversion.Converter.bigdecimal=org.apache.magma.conversion.string.BigDecimalConverter
org.apache.magma.conversion.Converter.biginteger=org.apache.magma.conversion.string.BigIntegerConverter
org.apache.magma.conversion.Converter.boolean=org.apache.magma.conversion.string.BooleanConverter
Modified: labs/magma/branches/0.0.2/foundation-beans/src/test/java/org/apache/magma/beans/BeanDataTest.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-beans/src/test/java/org/apache/magma/beans/BeanDataTest.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-beans/src/test/java/org/apache/magma/beans/BeanDataTest.java (original)
+++ labs/magma/branches/0.0.2/foundation-beans/src/test/java/org/apache/magma/beans/BeanDataTest.java Mon Oct 5 21:21:39 2009
@@ -46,7 +46,7 @@
assertTrue(propertyNames.contains("privString"));
assertTrue(propertyNames.contains("class"));
- assertEquals(6, propertyNames.size());
+ assertEquals(7, propertyNames.size());
}
@Test
@@ -76,4 +76,11 @@
PropertyInfo property = bd.getProperty("maskedDate");
assertEquals(Date.class, property.getType());
}
+
+ @Test
+ public void roProperty() throws Exception {
+ PropertyInfo property = bd.getProperty("roProp");
+ assertTrue(property.isReadable());
+ assertFalse(property.isWriteable());
+ }
}
Modified: labs/magma/branches/0.0.2/foundation-beans/src/test/java/org/apache/magma/beans/TestBean.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-beans/src/test/java/org/apache/magma/beans/TestBean.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-beans/src/test/java/org/apache/magma/beans/TestBean.java (original)
+++ labs/magma/branches/0.0.2/foundation-beans/src/test/java/org/apache/magma/beans/TestBean.java Mon Oct 5 21:21:39 2009
@@ -29,6 +29,15 @@
private List<String> aList;
private String maskedDate;
+ private String roProp;
+
+ public String getRoProp() {
+ return roProp;
+ }
+ @MagReadOnly
+ public void setRoProp(String roProp) {
+ this.roProp = roProp;
+ }
public String getPrivString() {
return privString;
}
Propchange: labs/magma/branches/0.0.2/foundation-beans/src/test/java/org/apache/magma/conversion/
('svn:mergeinfo' removed)
Propchange: labs/magma/branches/0.0.2/foundation-beans/src/test/java/org/apache/magma/conversion/string/TestDateConverterFromStringCorrect.java
('svn:mergeinfo' removed)
Propchange: labs/magma/branches/0.0.2/foundation-beans/src/test/java/org/apache/magma/conversion/string/TestDateConverterToStringCorrect.java
('svn:mergeinfo' removed)
Propchange: labs/magma/branches/0.0.2/foundation-beans/src/test/java/org/apache/magma/conversion/string/TestEnumConverterFromStringCorrect.java
('svn:mergeinfo' removed)
Propchange: labs/magma/branches/0.0.2/foundation-beans/src/test/java/org/apache/magma/conversion/string/TestEnumConverterToStringCorrect.java
('svn:mergeinfo' removed)
Propchange: labs/magma/branches/0.0.2/foundation-beans/src/test/java/org/apache/magma/conversion/string/TestIntegerConverterFromStringCorrect.java
('svn:mergeinfo' removed)
Propchange: labs/magma/branches/0.0.2/foundation-beans/src/test/java/org/apache/magma/conversion/string/TestIntegerConverterFromStringInCorrect.java
('svn:mergeinfo' removed)
Propchange: labs/magma/branches/0.0.2/foundation-beans/src/test/java/org/apache/magma/conversion/string/TestIntegerConverterToStringCorrect.java
('svn:mergeinfo' removed)
Propchange: labs/magma/branches/0.0.2/foundation-beans/src/test/java/org/apache/magma/conversion/string/TestShortConverterFromStringCorrect.java
('svn:mergeinfo' removed)
Propchange: labs/magma/branches/0.0.2/foundation-beans/src/test/java/org/apache/magma/conversion/string/TestShortConverterFromStringInCorrect.java
('svn:mergeinfo' removed)
Propchange: labs/magma/branches/0.0.2/foundation-beans/src/test/java/org/apache/magma/conversion/string/TestShortConverterToStringCorrect.java
('svn:mergeinfo' removed)
Modified: labs/magma/branches/0.0.2/foundation-database/src/main/java/org/apache/magma/database/AddDatabaseIdentityToBeanData.aj
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-database/src/main/java/org/apache/magma/database/AddDatabaseIdentityToBeanData.aj?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-database/src/main/java/org/apache/magma/database/AddDatabaseIdentityToBeanData.aj (original)
+++ labs/magma/branches/0.0.2/foundation-database/src/main/java/org/apache/magma/database/AddDatabaseIdentityToBeanData.aj Mon Oct 5 21:21:39 2009
@@ -1,3 +1,19 @@
+/*
+ * 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.magma.database;
import org.apache.magma.beans.BeanData;
Modified: labs/magma/branches/0.0.2/foundation-database/src/main/java/org/apache/magma/database/Database.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-database/src/main/java/org/apache/magma/database/Database.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-database/src/main/java/org/apache/magma/database/Database.java (original)
+++ labs/magma/branches/0.0.2/foundation-database/src/main/java/org/apache/magma/database/Database.java Mon Oct 5 21:21:39 2009
@@ -51,6 +51,26 @@
return null;
}
+ /**
+ * Loads an entity of the given class with the given logical name.
+ * <p>
+ * As an example :
+ * <code>
+ * Database db = new Database();
+ * Section s = db.names(Section.class, "news");
+ * </code>
+ * will load the section having a logical name "news".
+ * </p>
+ *
+ * @param <T> The class of the entity, must implement {@link LogicallyNamed}
+ * @param clazz The class of the entity, must implement {@link LogicallyNamed}
+ * @param logicalName The logical name to search for.
+ * @return An instance of the entity, or null if not found.
+ */
+ public <T extends LogicallyNamed> T named(Class<T> clazz, String logicalName) {
+ return null;
+ }
+
/**
* Executes a query returning all results. This is the same as calling
@@ -103,6 +123,24 @@
}
/**
+ * Counts how many entities with given query are present on the database.
+ * <p>
+ * The query follows the same rules of {@link #query(Class, String, Object...)}.
+ * </p>
+ * @param clazz The persistent (entity) class we want to count.
+ * @param query A query, which may be null or empty, describing which entities we are interested in counting.
+ * @param params Parameters to replace in the query, if any
+ * @return the number of entities matching the query criteria found on the database.
+ */
+ public int count(Class<?> clazz, String query, Object... params) {
+ if (query == null || query.length() == 0) {
+ return queryNumber("SELECT count(x) FROM " + clazz.getName() + " x").intValue();
+ } else {
+ return queryNumber("SELECT count(x) FROM " + clazz.getName() + " x WHERE " + query, params).intValue();
+ }
+ }
+
+ /**
* Executes a query that returns a single number.
* <p>
* This method is useful when the query needs to return a simple number, like a count or an average.
@@ -119,6 +157,7 @@
* </code>
* </p>
* @param query The query to execute
+ * @param params Parameters to replace in the query, if any
* @return The only number returned by the query.
*/
public Number queryNumber(String query, Object... params) {
Modified: labs/magma/branches/0.0.2/foundation-database/src/main/java/org/apache/magma/database/DatabaseConverter.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-database/src/main/java/org/apache/magma/database/DatabaseConverter.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-database/src/main/java/org/apache/magma/database/DatabaseConverter.java (original)
+++ labs/magma/branches/0.0.2/foundation-database/src/main/java/org/apache/magma/database/DatabaseConverter.java Mon Oct 5 21:21:39 2009
@@ -19,6 +19,7 @@
import org.apache.magma.beans.BeanData;
import org.apache.magma.conversion.Converter;
import org.apache.magma.conversion.GenericConverter;
+import org.apache.magma.basics.MagmaException;
public class DatabaseConverter implements Converter<DatabasePersisted> {
@@ -32,17 +33,43 @@
public DatabasePersisted from(String value) {
if (value == null || value.equals("")) return null;
- DatabaseIdentity id = BeanData.getFor(myclass).getDatabaseIdentity();
- Object key = id.getSubconverter().from(value);
+ DatabasePersisted ret = null;
+ Exception retexc = null;
Database db = new Database();
- return db.load(myclass, key);
+ try {
+ DatabaseIdentity id = BeanData.getFor(myclass).getDatabaseIdentity();
+ Object key = id.getSubconverter().from(value);
+ ret = db.load(myclass, key);
+ } catch (Exception e) {
+ retexc = e;
+ }
+ if (ret == null && LogicallyNamed.class.isAssignableFrom(myclass)) {
+ try {
+ ret = (DatabasePersisted) db.named((Class<? extends LogicallyNamed>)myclass, value);
+ } catch (Exception e) {
+ if (retexc == null) {
+ throw new MagmaException(e, "Error retriving {0} using logical name \"{1}\"", myclass, value);
+ } else {
+ throw new MagmaException(e, "Error retriving {0} using logical name \"{1}\"", myclass, value);
+ }
+ }
+ } else if (retexc != null) {
+ throw new MagmaException(retexc, "Error retrieving {0} using primary key \"{1}\"", myclass, value);
+ }
+ return ret;
}
@SuppressWarnings("unchecked")
public String to(DatabasePersisted value) {
if (value == null) return "";
- DatabaseIdentity id = BeanData.getFor(myclass).getDatabaseIdentity();
- String ret = id.getSubconverter().to(value.getPrimaryKey());
+ String ret = null;
+ if (value instanceof LogicallyNamed) {
+ ret = ((LogicallyNamed)value).getLogicalName();
+ }
+ if (ret == null || ret.length() == 0) {
+ DatabaseIdentity id = BeanData.getFor(myclass).getDatabaseIdentity();
+ ret = id.getSubconverter().to(value.getPrimaryKey());
+ }
return ret;
}
Modified: labs/magma/branches/0.0.2/foundation-database/src/main/java/org/apache/magma/database/DatabaseIdentity.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-database/src/main/java/org/apache/magma/database/DatabaseIdentity.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-database/src/main/java/org/apache/magma/database/DatabaseIdentity.java (original)
+++ labs/magma/branches/0.0.2/foundation-database/src/main/java/org/apache/magma/database/DatabaseIdentity.java Mon Oct 5 21:21:39 2009
@@ -1,3 +1,19 @@
+/*
+ * 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.magma.database;
import java.lang.reflect.Field;
Modified: labs/magma/branches/0.0.2/foundation-database/src/main/resources/META-INF/magma.default.properties
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-database/src/main/resources/META-INF/magma.default.properties?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-database/src/main/resources/META-INF/magma.default.properties (original)
+++ labs/magma/branches/0.0.2/foundation-database/src/main/resources/META-INF/magma.default.properties Mon Oct 5 21:21:39 2009
@@ -1 +1,15 @@
-org.apache.magma.conversion.Converter.database=org.apache.magma.database.DatabaseConverter
\ No newline at end of file
+#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.
+org.apache.magma.conversion.Converter.database=org.apache.magma.database.DatabaseConverter
Modified: labs/magma/branches/0.0.2/foundation-database/src/test/java/org/apache/magma/database/TestJPAConverter.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-database/src/test/java/org/apache/magma/database/TestJPAConverter.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-database/src/test/java/org/apache/magma/database/TestJPAConverter.java (original)
+++ labs/magma/branches/0.0.2/foundation-database/src/test/java/org/apache/magma/database/TestJPAConverter.java Mon Oct 5 21:21:39 2009
@@ -16,6 +16,7 @@
*/
package org.apache.magma.database;
+import static org.junit.Assert.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -41,6 +42,21 @@
assertNotNull(tos);
assertEquals("5", tos);
}
+
+ @Test
+ public void named() throws Exception {
+ Converter converter = Converters.getConverterFor(LogicallyNamedBean.class);
+ assertNotNull(converter);
+ assertTrue(converter instanceof DatabaseConverter);
+ DatabaseConverter conv = (DatabaseConverter) converter;
+ LogicallyNamedBean b = new LogicallyNamedBean();
+ b.setId(5);
+ b.setName("Simone");
+ b.setLogicalName("simone");
+ String tos = converter.to(b);
+ assertNotNull(tos);
+ assertEquals("simone", tos);
+ }
}
Modified: labs/magma/branches/0.0.2/foundation-email/pom.xml
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-email/pom.xml?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-email/pom.xml (original)
+++ labs/magma/branches/0.0.2/foundation-email/pom.xml Mon Oct 5 21:21:39 2009
@@ -1,4 +1,20 @@
<?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.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<artifactId>magma-parent</artifactId>
Modified: labs/magma/branches/0.0.2/foundation-email/src/main/java/org/apache/magma/email/Email.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-email/src/main/java/org/apache/magma/email/Email.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-email/src/main/java/org/apache/magma/email/Email.java (original)
+++ labs/magma/branches/0.0.2/foundation-email/src/main/java/org/apache/magma/email/Email.java Mon Oct 5 21:21:39 2009
@@ -1,3 +1,19 @@
+/*
+ * 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.magma.email;
import org.apache.magma.settings.Settings;
Modified: labs/magma/branches/0.0.2/foundation-email/src/main/java/org/apache/magma/email/InitEmail.aj
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-email/src/main/java/org/apache/magma/email/InitEmail.aj?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-email/src/main/java/org/apache/magma/email/InitEmail.aj (original)
+++ labs/magma/branches/0.0.2/foundation-email/src/main/java/org/apache/magma/email/InitEmail.aj Mon Oct 5 21:21:39 2009
@@ -1,3 +1,19 @@
+/*
+ * 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.magma.email;
public aspect InitEmail {
Modified: labs/magma/branches/0.0.2/foundation-i18n/pom.xml
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-i18n/pom.xml?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-i18n/pom.xml (original)
+++ labs/magma/branches/0.0.2/foundation-i18n/pom.xml Mon Oct 5 21:21:39 2009
@@ -1,4 +1,20 @@
<?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.
+-->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<parent>
<artifactId>magma-parent</artifactId>
@@ -36,4 +52,4 @@
<version>0.0.2-SNAPSHOT</version>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/ContextMatrix.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/ContextMatrix.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/ContextMatrix.java (original)
+++ labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/ContextMatrix.java Mon Oct 5 21:21:39 2009
@@ -1,3 +1,19 @@
+/*
+ * 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.magma.i18n;
import java.util.ArrayList;
Modified: labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/CurrentLocale.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/CurrentLocale.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/CurrentLocale.java (original)
+++ labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/CurrentLocale.java Mon Oct 5 21:21:39 2009
@@ -1,3 +1,19 @@
+/*
+ * 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.magma.i18n;
import java.util.HashMap;
Modified: labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/Format.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/Format.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/Format.java (original)
+++ labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/Format.java Mon Oct 5 21:21:39 2009
@@ -1,3 +1,19 @@
+/*
+ * 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.magma.i18n;
import java.lang.annotation.ElementType;
Modified: labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/Formatter.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/Formatter.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/Formatter.java (original)
+++ labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/Formatter.java Mon Oct 5 21:21:39 2009
@@ -1,3 +1,19 @@
+/*
+ * 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.magma.i18n;
import java.util.Date;
Modified: labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/Formatters.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/Formatters.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/Formatters.java (original)
+++ labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/Formatters.java Mon Oct 5 21:21:39 2009
@@ -1,3 +1,19 @@
+/*
+ * 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.magma.i18n;
import java.util.Iterator;
Modified: labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/I18nContextElement.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/I18nContextElement.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/I18nContextElement.java (original)
+++ labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/I18nContextElement.java Mon Oct 5 21:21:39 2009
@@ -1,3 +1,19 @@
+/*
+ * 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.magma.i18n;
import org.apache.magma.basics.context.ContextElement;
Modified: labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/I18nContextElementsInstall.aj
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/I18nContextElementsInstall.aj?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/I18nContextElementsInstall.aj (original)
+++ labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/I18nContextElementsInstall.aj Mon Oct 5 21:21:39 2009
@@ -1,3 +1,19 @@
+/*
+ * 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.magma.i18n;
import org.apache.magma.basics.context.ContextElement;
Modified: labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/I18nMultiSegmentContextElement.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/I18nMultiSegmentContextElement.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/I18nMultiSegmentContextElement.java (original)
+++ labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/I18nMultiSegmentContextElement.java Mon Oct 5 21:21:39 2009
@@ -1,3 +1,19 @@
+/*
+ * 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.magma.i18n;
import org.apache.magma.basics.context.ContextElement;
Modified: labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/I18nRenderingHelper.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/I18nRenderingHelper.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/I18nRenderingHelper.java (original)
+++ labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/I18nRenderingHelper.java Mon Oct 5 21:21:39 2009
@@ -1,3 +1,19 @@
+/*
+ * 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.magma.i18n;
import java.util.Date;
@@ -47,7 +63,7 @@
* @return the formatted date
*/
public String tr(Date date, String format) {
- DateFormatter df = new DateFormatter();
+ Formatter<Date> df = Formatters.getFormatterFor(Date.class);
df.setFormat(format);
return df.to(date);
}
Modified: labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/I18nSingleSegmentContextElement.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/I18nSingleSegmentContextElement.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/I18nSingleSegmentContextElement.java (original)
+++ labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/I18nSingleSegmentContextElement.java Mon Oct 5 21:21:39 2009
@@ -1,3 +1,19 @@
+/*
+ * 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.magma.i18n;
import org.apache.magma.basics.context.ContextElement;
Modified: labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/LocaleHolder.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/LocaleHolder.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/LocaleHolder.java (original)
+++ labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/LocaleHolder.java Mon Oct 5 21:21:39 2009
@@ -1,3 +1,19 @@
+/*
+ * 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.magma.i18n;
import java.io.File;
@@ -163,7 +179,7 @@
}
if (sb.length() > 30) {
int add = sb.length() - 30;
- sb.delete(30, sb.length() - 1);
+ sb.delete(30, sb.length());
sb.append('+');
sb.append(Integer.toString(add));
}
Modified: labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/LocalizeLocalizableString.aj
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/LocalizeLocalizableString.aj?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/LocalizeLocalizableString.aj (original)
+++ labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/LocalizeLocalizableString.aj Mon Oct 5 21:21:39 2009
@@ -1,3 +1,19 @@
+/*
+ * 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.magma.i18n;
import java.text.MessageFormat;
Modified: labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/NilFormatter.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/NilFormatter.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/NilFormatter.java (original)
+++ labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/NilFormatter.java Mon Oct 5 21:21:39 2009
@@ -1,3 +1,19 @@
+/*
+ * 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.magma.i18n;
import org.apache.magma.conversion.Converter;
Modified: labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/BooleanFormatter.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/BooleanFormatter.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/BooleanFormatter.java (original)
+++ labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/BooleanFormatter.java Mon Oct 5 21:21:39 2009
@@ -1,3 +1,19 @@
+/*
+ * 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.magma.i18n.formatters;
import org.apache.magma.conversion.string.BooleanConverter;
Modified: labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/DateFormatter.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/DateFormatter.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/DateFormatter.java (original)
+++ labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/DateFormatter.java Mon Oct 5 21:21:39 2009
@@ -1,3 +1,19 @@
+/*
+ * 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.magma.i18n.formatters;
import org.apache.magma.basics.LocalizableString;
Modified: labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/DoubleFormatter.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/DoubleFormatter.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/DoubleFormatter.java (original)
+++ labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/DoubleFormatter.java Mon Oct 5 21:21:39 2009
@@ -1,3 +1,19 @@
+/*
+ * 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.magma.i18n.formatters;
import java.text.DecimalFormat;
Modified: labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/EnumFormatter.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/EnumFormatter.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/EnumFormatter.java (original)
+++ labs/magma/branches/0.0.2/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/EnumFormatter.java Mon Oct 5 21:21:39 2009
@@ -1,3 +1,19 @@
+/*
+ * 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.magma.i18n.formatters;
import org.apache.magma.conversion.string.EnumConverter;
Modified: labs/magma/branches/0.0.2/foundation-i18n/src/main/resources/META-INF/magma.default.properties
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-i18n/src/main/resources/META-INF/magma.default.properties?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-i18n/src/main/resources/META-INF/magma.default.properties (original)
+++ labs/magma/branches/0.0.2/foundation-i18n/src/main/resources/META-INF/magma.default.properties Mon Oct 5 21:21:39 2009
@@ -1,3 +1,17 @@
+#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.
org.apache.magma.i18n.Formatter.date=org.apache.magma.i18n.formatters.DateFormatter
org.apache.magma.i18n.Formatter.double=org.apache.magma.i18n.formatters.DoubleFormatter
org.apache.magma.i18n.Formatter.boolean=org.apache.magma.i18n.formatters.BooleanFormatter
Modified: labs/magma/branches/0.0.2/foundation-i18n/src/test/java/org/apache/magma/i18n/FormatOnBeanTest.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-i18n/src/test/java/org/apache/magma/i18n/FormatOnBeanTest.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-i18n/src/test/java/org/apache/magma/i18n/FormatOnBeanTest.java (original)
+++ labs/magma/branches/0.0.2/foundation-i18n/src/test/java/org/apache/magma/i18n/FormatOnBeanTest.java Mon Oct 5 21:21:39 2009
@@ -1,3 +1,19 @@
+/*
+ * 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.magma.i18n;
import java.text.SimpleDateFormat;
Modified: labs/magma/branches/0.0.2/foundation-i18n/src/test/java/org/apache/magma/i18n/MatchingTest.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-i18n/src/test/java/org/apache/magma/i18n/MatchingTest.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-i18n/src/test/java/org/apache/magma/i18n/MatchingTest.java (original)
+++ labs/magma/branches/0.0.2/foundation-i18n/src/test/java/org/apache/magma/i18n/MatchingTest.java Mon Oct 5 21:21:39 2009
@@ -1,3 +1,19 @@
+/*
+ * 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.magma.i18n;
import static org.junit.Assert.*;
Modified: labs/magma/branches/0.0.2/foundation-i18n/src/test/java/org/apache/magma/i18n/NormalizationTest.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-i18n/src/test/java/org/apache/magma/i18n/NormalizationTest.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-i18n/src/test/java/org/apache/magma/i18n/NormalizationTest.java (original)
+++ labs/magma/branches/0.0.2/foundation-i18n/src/test/java/org/apache/magma/i18n/NormalizationTest.java Mon Oct 5 21:21:39 2009
@@ -1,3 +1,19 @@
+/*
+ * 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.magma.i18n;
import org.junit.Test;
@@ -16,7 +32,8 @@
SET2 = { "plain_admissible", "plainadmissible"},
SET3 = { "plain with space", "plainwithspace"},
SET4 = { "numb3r5", "numb3r5"},
- SET5 = { "anything @#{0}.", "anything_0_"};
+ SET5 = { "anything @#{0}.", "anything_0_"},
+ SET6 = { "Text longer than 30 chars should be cut with proper number", "textlongerthan30charsshouldbec+18"};
@Theory
public void normalization(String[] set) {
Modified: labs/magma/branches/0.0.2/foundation-i18n/src/test/java/org/apache/magma/i18n/formatters/DateFormatterFormatTest.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-i18n/src/test/java/org/apache/magma/i18n/formatters/DateFormatterFormatTest.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-i18n/src/test/java/org/apache/magma/i18n/formatters/DateFormatterFormatTest.java (original)
+++ labs/magma/branches/0.0.2/foundation-i18n/src/test/java/org/apache/magma/i18n/formatters/DateFormatterFormatTest.java Mon Oct 5 21:21:39 2009
@@ -1,3 +1,19 @@
+/*
+ * 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.magma.i18n.formatters;
import java.text.SimpleDateFormat;
Modified: labs/magma/branches/0.0.2/foundation-i18n/src/test/java/org/apache/magma/i18n/formatters/DoubleFormatterTest.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-i18n/src/test/java/org/apache/magma/i18n/formatters/DoubleFormatterTest.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-i18n/src/test/java/org/apache/magma/i18n/formatters/DoubleFormatterTest.java (original)
+++ labs/magma/branches/0.0.2/foundation-i18n/src/test/java/org/apache/magma/i18n/formatters/DoubleFormatterTest.java Mon Oct 5 21:21:39 2009
@@ -1,3 +1,19 @@
+/*
+ * 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.magma.i18n.formatters;
import java.util.Locale;
Modified: labs/magma/branches/0.0.2/foundation-i18n/src/test/java/org/apache/magma/i18n/teststuff/ExplicitlyFormattedBean.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-i18n/src/test/java/org/apache/magma/i18n/teststuff/ExplicitlyFormattedBean.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-i18n/src/test/java/org/apache/magma/i18n/teststuff/ExplicitlyFormattedBean.java (original)
+++ labs/magma/branches/0.0.2/foundation-i18n/src/test/java/org/apache/magma/i18n/teststuff/ExplicitlyFormattedBean.java Mon Oct 5 21:21:39 2009
@@ -1,3 +1,19 @@
+/*
+ * 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.magma.i18n.teststuff;
import java.util.Date;
Modified: labs/magma/branches/0.0.2/foundation-i18n/src/test/java/org/apache/magma/i18n/teststuff/ImplicitlyFormattedBean.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-i18n/src/test/java/org/apache/magma/i18n/teststuff/ImplicitlyFormattedBean.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-i18n/src/test/java/org/apache/magma/i18n/teststuff/ImplicitlyFormattedBean.java (original)
+++ labs/magma/branches/0.0.2/foundation-i18n/src/test/java/org/apache/magma/i18n/teststuff/ImplicitlyFormattedBean.java Mon Oct 5 21:21:39 2009
@@ -1,3 +1,19 @@
+/*
+ * 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.magma.i18n.teststuff;
import java.util.Date;
Modified: labs/magma/branches/0.0.2/foundation-jobs/pom.xml
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-jobs/pom.xml?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-jobs/pom.xml (original)
+++ labs/magma/branches/0.0.2/foundation-jobs/pom.xml Mon Oct 5 21:21:39 2009
@@ -1,4 +1,20 @@
<?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.
+-->
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<parent>
<artifactId>magma-parent</artifactId>
@@ -19,4 +35,4 @@
<version>0.0.2-SNAPSHOT</version>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: labs/magma/branches/0.0.2/foundation-jobs/src/main/java/org/apache/magma/jobs/Every.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-jobs/src/main/java/org/apache/magma/jobs/Every.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-jobs/src/main/java/org/apache/magma/jobs/Every.java (original)
+++ labs/magma/branches/0.0.2/foundation-jobs/src/main/java/org/apache/magma/jobs/Every.java Mon Oct 5 21:21:39 2009
@@ -1,3 +1,19 @@
+/*
+ * 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.magma.jobs;
public enum Every implements SimpleTrigger {
Modified: labs/magma/branches/0.0.2/foundation-jobs/src/main/java/org/apache/magma/jobs/FineEvery.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-jobs/src/main/java/org/apache/magma/jobs/FineEvery.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-jobs/src/main/java/org/apache/magma/jobs/FineEvery.java (original)
+++ labs/magma/branches/0.0.2/foundation-jobs/src/main/java/org/apache/magma/jobs/FineEvery.java Mon Oct 5 21:21:39 2009
@@ -1,3 +1,19 @@
+/*
+ * 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.magma.jobs;
public class FineEvery implements SimpleTrigger {
Modified: labs/magma/branches/0.0.2/foundation-jobs/src/main/java/org/apache/magma/jobs/Job.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-jobs/src/main/java/org/apache/magma/jobs/Job.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-jobs/src/main/java/org/apache/magma/jobs/Job.java (original)
+++ labs/magma/branches/0.0.2/foundation-jobs/src/main/java/org/apache/magma/jobs/Job.java Mon Oct 5 21:21:39 2009
@@ -1,3 +1,19 @@
+/*
+ * 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.magma.jobs;
import org.apache.magma.beans.MagmaBeanSupport;
Modified: labs/magma/branches/0.0.2/foundation-jobs/src/main/java/org/apache/magma/jobs/JobStatus.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-jobs/src/main/java/org/apache/magma/jobs/JobStatus.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-jobs/src/main/java/org/apache/magma/jobs/JobStatus.java (original)
+++ labs/magma/branches/0.0.2/foundation-jobs/src/main/java/org/apache/magma/jobs/JobStatus.java Mon Oct 5 21:21:39 2009
@@ -1,3 +1,19 @@
+/*
+ * 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.magma.jobs;
import java.util.Date;
Modified: labs/magma/branches/0.0.2/foundation-jobs/src/main/java/org/apache/magma/jobs/JobsAreMagmaBeans.aj
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-jobs/src/main/java/org/apache/magma/jobs/JobsAreMagmaBeans.aj?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-jobs/src/main/java/org/apache/magma/jobs/JobsAreMagmaBeans.aj (original)
+++ labs/magma/branches/0.0.2/foundation-jobs/src/main/java/org/apache/magma/jobs/JobsAreMagmaBeans.aj Mon Oct 5 21:21:39 2009
@@ -1,3 +1,19 @@
+/*
+ * 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.magma.jobs;
import org.apache.magma.beans.MagmaBeanSupport;
Modified: labs/magma/branches/0.0.2/foundation-jobs/src/main/java/org/apache/magma/jobs/JobsCycling.aj
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-jobs/src/main/java/org/apache/magma/jobs/JobsCycling.aj?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-jobs/src/main/java/org/apache/magma/jobs/JobsCycling.aj (original)
+++ labs/magma/branches/0.0.2/foundation-jobs/src/main/java/org/apache/magma/jobs/JobsCycling.aj Mon Oct 5 21:21:39 2009
@@ -1,3 +1,19 @@
+/*
+ * 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.magma.jobs;
import org.apache.magma.basics.startup.Cycle;
Modified: labs/magma/branches/0.0.2/foundation-jobs/src/main/java/org/apache/magma/jobs/Report.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-jobs/src/main/java/org/apache/magma/jobs/Report.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-jobs/src/main/java/org/apache/magma/jobs/Report.java (original)
+++ labs/magma/branches/0.0.2/foundation-jobs/src/main/java/org/apache/magma/jobs/Report.java Mon Oct 5 21:21:39 2009
@@ -1,3 +1,19 @@
+/*
+ * 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.magma.jobs;
public class Report {
Modified: labs/magma/branches/0.0.2/foundation-jobs/src/main/java/org/apache/magma/jobs/Scheduler.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-jobs/src/main/java/org/apache/magma/jobs/Scheduler.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-jobs/src/main/java/org/apache/magma/jobs/Scheduler.java (original)
+++ labs/magma/branches/0.0.2/foundation-jobs/src/main/java/org/apache/magma/jobs/Scheduler.java Mon Oct 5 21:21:39 2009
@@ -1,3 +1,19 @@
+/*
+ * 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.magma.jobs;
import java.util.List;
Modified: labs/magma/branches/0.0.2/foundation-jobs/src/main/java/org/apache/magma/jobs/SimpleTrigger.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-jobs/src/main/java/org/apache/magma/jobs/SimpleTrigger.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-jobs/src/main/java/org/apache/magma/jobs/SimpleTrigger.java (original)
+++ labs/magma/branches/0.0.2/foundation-jobs/src/main/java/org/apache/magma/jobs/SimpleTrigger.java Mon Oct 5 21:21:39 2009
@@ -1,3 +1,19 @@
+/*
+ * 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.magma.jobs;
public interface SimpleTrigger extends Trigger {
Modified: labs/magma/branches/0.0.2/foundation-jobs/src/main/java/org/apache/magma/jobs/Trigger.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-jobs/src/main/java/org/apache/magma/jobs/Trigger.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-jobs/src/main/java/org/apache/magma/jobs/Trigger.java (original)
+++ labs/magma/branches/0.0.2/foundation-jobs/src/main/java/org/apache/magma/jobs/Trigger.java Mon Oct 5 21:21:39 2009
@@ -1,3 +1,19 @@
+/*
+ * 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.magma.jobs;
public interface Trigger {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org