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 [4/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-maps/pom.xml
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-maps/pom.xml?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-maps/pom.xml (original)
+++ labs/magma/branches/0.0.2/foundation-maps/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>
@@ -29,4 +45,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-maps/src/main/java/org/apache/magma/maps/DefaultGeoLocatedImplementation.aj
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-maps/src/main/java/org/apache/magma/maps/DefaultGeoLocatedImplementation.aj?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-maps/src/main/java/org/apache/magma/maps/DefaultGeoLocatedImplementation.aj (original)
+++ labs/magma/branches/0.0.2/foundation-maps/src/main/java/org/apache/magma/maps/DefaultGeoLocatedImplementation.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.maps;
public aspect DefaultGeoLocatedImplementation {
Modified: labs/magma/branches/0.0.2/foundation-maps/src/main/java/org/apache/magma/maps/GeoAware.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-maps/src/main/java/org/apache/magma/maps/GeoAware.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-maps/src/main/java/org/apache/magma/maps/GeoAware.java (original)
+++ labs/magma/branches/0.0.2/foundation-maps/src/main/java/org/apache/magma/maps/GeoAware.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.maps;
public interface GeoAware {
Modified: labs/magma/branches/0.0.2/foundation-maps/src/main/java/org/apache/magma/maps/GeoCoordinates.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-maps/src/main/java/org/apache/magma/maps/GeoCoordinates.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-maps/src/main/java/org/apache/magma/maps/GeoCoordinates.java (original)
+++ labs/magma/branches/0.0.2/foundation-maps/src/main/java/org/apache/magma/maps/GeoCoordinates.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.maps;
import java.text.DecimalFormat;
Modified: labs/magma/branches/0.0.2/foundation-maps/src/main/java/org/apache/magma/maps/GeoLocated.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-maps/src/main/java/org/apache/magma/maps/GeoLocated.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-maps/src/main/java/org/apache/magma/maps/GeoLocated.java (original)
+++ labs/magma/branches/0.0.2/foundation-maps/src/main/java/org/apache/magma/maps/GeoLocated.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.maps;
import javax.persistence.Embedded;
Modified: labs/magma/branches/0.0.2/foundation-maps/src/main/java/org/apache/magma/maps/GeoResolvable.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-maps/src/main/java/org/apache/magma/maps/GeoResolvable.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-maps/src/main/java/org/apache/magma/maps/GeoResolvable.java (original)
+++ labs/magma/branches/0.0.2/foundation-maps/src/main/java/org/apache/magma/maps/GeoResolvable.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.maps;
public interface GeoResolvable extends GeoLocated {
Modified: labs/magma/branches/0.0.2/foundation-maps/src/main/java/org/apache/magma/maps/GeoResolver.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-maps/src/main/java/org/apache/magma/maps/GeoResolver.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-maps/src/main/java/org/apache/magma/maps/GeoResolver.java (original)
+++ labs/magma/branches/0.0.2/foundation-maps/src/main/java/org/apache/magma/maps/GeoResolver.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.maps;
public class GeoResolver {
Modified: labs/magma/branches/0.0.2/foundation-validation/src/main/java/org/apache/magma/validation/AddValidationInHandler.aj
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-validation/src/main/java/org/apache/magma/validation/AddValidationInHandler.aj?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-validation/src/main/java/org/apache/magma/validation/AddValidationInHandler.aj (original)
+++ labs/magma/branches/0.0.2/foundation-validation/src/main/java/org/apache/magma/validation/AddValidationInHandler.aj Mon Oct 5 21:21:39 2009
@@ -26,6 +26,13 @@
public privileged aspect AddValidationInHandler {
+ public boolean BeanHandler.needsValidation(String field) {
+ PropertyInfo property = data.getProperty(field);
+ if (property == null) throw new MagmaException("Cannot find a property named {0} in class {1}", field, bean.getClass().getName());
+ Validator v = property.getValidator();
+ return (v != null);
+ }
+
public void BeanHandler.validate(String field, Object value) {
PropertyInfo property = data.getProperty(field);
if (property == null) throw new MagmaException("Cannot find a property named {0} in class {1}", field, bean.getClass().getName());
@@ -41,8 +48,10 @@
}
public void BeanHandler.validate(String field) {
- Object val = values.get(field);
- validate(field, val);
+ if (needsValidation(field)) {
+ Object val = getValue(field);
+ validate(field, val);
+ }
}
public void BeanHandler.validate() {
Modified: labs/magma/branches/0.0.2/foundation-validation/src/main/java/org/apache/magma/validation/validators/EmailValidator.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-validation/src/main/java/org/apache/magma/validation/validators/EmailValidator.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-validation/src/main/java/org/apache/magma/validation/validators/EmailValidator.java (original)
+++ labs/magma/branches/0.0.2/foundation-validation/src/main/java/org/apache/magma/validation/validators/EmailValidator.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.validation.validators;
public class EmailValidator extends RegexValidator {
Modified: labs/magma/branches/0.0.2/foundation-validation/src/main/java/org/apache/magma/validation/validators/LengthValidator.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-validation/src/main/java/org/apache/magma/validation/validators/LengthValidator.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-validation/src/main/java/org/apache/magma/validation/validators/LengthValidator.java (original)
+++ labs/magma/branches/0.0.2/foundation-validation/src/main/java/org/apache/magma/validation/validators/LengthValidator.java Mon Oct 5 21:21:39 2009
@@ -28,7 +28,10 @@
private int min = 0;
private int max = Integer.MAX_VALUE;
- private String errorString = "Text must be at between {0} and {1} charachters";
+ static final String errorMin = "Text must be at least {0} characters";
+ static final String errorMax = "Text must be at most {1} characters";
+ static final String errorBoth = "Text must be at between {0} and {1} characters";
+ private String errorCur = null;
private List<LocalizableString> myError = null;
public LengthValidator() {
@@ -36,12 +39,13 @@
public LengthValidator(int min, int max) {
this(min, max, null);
+
}
public LengthValidator(int min, int max, String error) {
this.min = min;
this.max = max;
- if (error != null) errorString = error;
+ if (error != null) errorCur = error;
setupError();
}
@@ -56,7 +60,7 @@
}
public void setError(String error) {
- this.errorString = error;
+ this.errorCur = error;
setupError();
}
@@ -66,7 +70,20 @@
} else {
this.myError.clear();
}
- this.myError.add(new LocalizableString(errorString, min, max));
+ if (min == 0) {
+ if (max == Integer.MAX_VALUE) {
+ errorCur = "NA";
+ } else {
+ errorCur = errorMax;
+ }
+ } else {
+ if (max == Integer.MAX_VALUE) {
+ errorCur = errorMin;
+ } else {
+ errorCur = errorMax;
+ }
+ }
+ this.myError.add(new LocalizableString(errorCur, min, max));
}
public List<LocalizableString> validate(Object bean, PropertyInfo property, CharSequence value) {
Modified: labs/magma/branches/0.0.2/foundation-validation/src/main/java/org/apache/magma/validation/validators/RangeValidator.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-validation/src/main/java/org/apache/magma/validation/validators/RangeValidator.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-validation/src/main/java/org/apache/magma/validation/validators/RangeValidator.java (original)
+++ labs/magma/branches/0.0.2/foundation-validation/src/main/java/org/apache/magma/validation/validators/RangeValidator.java Mon Oct 5 21:21:39 2009
@@ -29,7 +29,10 @@
private Number min;
private Number max;
- private String errorString = "RangeValidator.error";
+ static final String errorMin = "Must be at least {0}";
+ static final String errorMax = "Must be at most {1}";
+ static final String errorBoth = "Must be between {0} and {1}";
+ private String errorCur = null;
private List<LocalizableString> myError = null;
public RangeValidator() {
@@ -42,7 +45,7 @@
public RangeValidator(Number min, Number max, String error) {
this.min = min;
this.max = max;
- if (error != null) errorString = error;
+ if (error != null) errorCur = error;
setupError();
}
@@ -71,7 +74,7 @@
}
public void setError(String error) {
- this.errorString = error;
+ this.errorCur = error;
setupError();
}
@@ -81,7 +84,22 @@
} else {
this.myError.clear();
}
- this.myError.add(new LocalizableString(errorString, min, max));
+ if (errorCur == null) {
+ if (min == null || min.equals(Long.MIN_VALUE)) {
+ if (max == null || max.equals(Long.MAX_VALUE)) {
+ errorCur = "NA";
+ } else {
+ errorCur = errorMax;
+ }
+ } else {
+ if (max == null || max.equals(Long.MAX_VALUE)) {
+ errorCur = errorMin;
+ } else {
+ errorCur = errorBoth;
+ }
+ }
+ }
+ this.myError.add(new LocalizableString(errorCur, min, max));
}
public List<LocalizableString> validate(Object bean, PropertyInfo property, Number value) {
Modified: labs/magma/branches/0.0.2/foundation-validation/src/main/java/org/apache/magma/validation/validators/RegexValidator.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-validation/src/main/java/org/apache/magma/validation/validators/RegexValidator.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-validation/src/main/java/org/apache/magma/validation/validators/RegexValidator.java (original)
+++ labs/magma/branches/0.0.2/foundation-validation/src/main/java/org/apache/magma/validation/validators/RegexValidator.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.validation.validators;
import java.util.Arrays;
Modified: labs/magma/branches/0.0.2/foundation-validation/src/main/java/org/apache/magma/validation/validators/RequiredValidator.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-validation/src/main/java/org/apache/magma/validation/validators/RequiredValidator.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-validation/src/main/java/org/apache/magma/validation/validators/RequiredValidator.java (original)
+++ labs/magma/branches/0.0.2/foundation-validation/src/main/java/org/apache/magma/validation/validators/RequiredValidator.java Mon Oct 5 21:21:39 2009
@@ -28,7 +28,7 @@
private List<LocalizableString> myError = new ArrayList<LocalizableString>(1);
public RequiredValidator() {
- myError.add(new LocalizableString("RequiredValidator.required"));
+ myError.add(new LocalizableString("This is a required field"));
}
public void setError(String error) {
Modified: labs/magma/branches/0.0.2/foundation-validation/src/test/java/org/apache/magma/validation/validators/RangeValidatorWrongValidations.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-validation/src/test/java/org/apache/magma/validation/validators/RangeValidatorWrongValidations.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-validation/src/test/java/org/apache/magma/validation/validators/RangeValidatorWrongValidations.java (original)
+++ labs/magma/branches/0.0.2/foundation-validation/src/test/java/org/apache/magma/validation/validators/RangeValidatorWrongValidations.java Mon Oct 5 21:21:39 2009
@@ -20,12 +20,16 @@
package org.apache.magma.validation.validators;
import static org.hamcrest.CoreMatchers.not;
+import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.CoreMatchers.nullValue;
import static org.junit.Assert.assertThat;
import java.math.BigDecimal;
import java.math.BigInteger;
+import java.util.List;
+import org.apache.magma.basics.LocalizableString;
+import org.hamcrest.core.IsEqual;
import org.junit.experimental.theories.DataPoint;
import org.junit.experimental.theories.Theories;
import org.junit.experimental.theories.Theory;
@@ -48,6 +52,17 @@
@Theory public void validates(Number[] numbers) {
RangeValidator v = new RangeValidator(numbers[0], numbers[1]);
- assertThat(v.validate(null,null,numbers[2]), not(nullValue()));
+ List<LocalizableString> res = v.validate(null,null,numbers[2]);
+ assertThat(res, not(nullValue()));
+ assertThat(res.size(), equalTo(1));
+ LocalizableString errstr = res.get(0);
+ String errmsg = errstr.getMessage();
+ if (numbers[0] == null) {
+ assertThat(errmsg, equalTo(RangeValidator.errorMax));
+ } else if (numbers[1] == null) {
+ assertThat(errmsg, equalTo(RangeValidator.errorMin));
+ } else {
+ assertThat(errmsg, equalTo(RangeValidator.errorBoth));
+ }
}
}
Modified: labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/AddHeadOnloadFunctions.aj
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/AddHeadOnloadFunctions.aj?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/AddHeadOnloadFunctions.aj (original)
+++ labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/AddHeadOnloadFunctions.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.website;
public aspect AddHeadOnloadFunctions {
Modified: labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/CommonResourcesHandler.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/CommonResourcesHandler.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/CommonResourcesHandler.java (original)
+++ labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/CommonResourcesHandler.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.website;
public class CommonResourcesHandler extends WebHandler {
Modified: labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/CompoundType.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/CompoundType.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/CompoundType.java (original)
+++ labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/CompoundType.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.website;
public enum CompoundType {
Modified: labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/CompoundableProducer.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/CompoundableProducer.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/CompoundableProducer.java (original)
+++ labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/CompoundableProducer.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.website;
import java.util.List;
Modified: labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/CompoundableProducerImpl.aj
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/CompoundableProducerImpl.aj?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/CompoundableProducerImpl.aj (original)
+++ labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/CompoundableProducerImpl.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.website;
import java.io.IOException;
Modified: labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/Dispatch.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/Dispatch.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/Dispatch.java (original)
+++ labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/Dispatch.java Mon Oct 5 21:21:39 2009
@@ -96,13 +96,13 @@
}
// try to resolve the path
- Producer producer = findProducer(pathInfo);
- if (producer == null && originalPathInfo != null) {
- // Fall back, in case of resources
- producer = findProducer(originalPathInfo);
- extension = "HTML";
- }
try {
+ Producer producer = findProducer(pathInfo);
+ if (producer == null && originalPathInfo != null) {
+ // Fall back, in case of resources
+ producer = findProducer(originalPathInfo);
+ extension = "HTML";
+ }
if (producer != null) {
if (method == null) {
method = findMethod(extension);
@@ -144,12 +144,23 @@
}
protected void handleException(Throwable t, HttpServletResponse resp) {
- ServletOutputStream out = null;
try {
+ // Find the exception hidden inside redirects
+ Throwable act = t;
+ while (act.getCause() != null) act = act.getCause();
+ if (act instanceof HttpCodeException) {
+ ((HttpCodeException)act).apply(resp);
+ return;
+ }
+ ServletOutputStream out = null;
out = resp.getOutputStream();
out.write("<pre>".getBytes());
+ if (act != null && act != t) {
+ act.printStackTrace(new PrintStream(out));
+ }
+ out.write("<small>".getBytes());
t.printStackTrace(new PrintStream(out));
- out.write("</pre>".getBytes());
+ out.write("</small></pre>".getBytes());
} catch (IOException e) {
t.printStackTrace();
return;
Modified: labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/Head.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/Head.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/Head.java (original)
+++ labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/Head.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.website;
import java.io.IOException;
Modified: labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/NiceExceptionDisplay.aj
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/NiceExceptionDisplay.aj?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/NiceExceptionDisplay.aj (original)
+++ labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/NiceExceptionDisplay.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.website;
import org.apache.magma.website.templating.Template;
Modified: labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/StreamProducer.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/StreamProducer.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/StreamProducer.java (original)
+++ labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/StreamProducer.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.website;
import java.io.IOException;
Modified: labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/WebHandler.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/WebHandler.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/WebHandler.java (original)
+++ labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/WebHandler.java Mon Oct 5 21:21:39 2009
@@ -19,11 +19,13 @@
import org.apache.magma.basics.MagmaException;
import org.apache.magma.basics.context.ContextOwner;
import org.apache.magma.basics.context.RunningContext;
+import org.apache.magma.basics.startup.Cycle;
import org.apache.magma.basics.utils.GenericClass;
import org.apache.magma.basics.utils.GenericClass.MethodDef;
import org.apache.magma.conversion.Converter;
import org.apache.magma.conversion.Converters;
import org.apache.magma.website.templating.Template;
+import org.apache.magma.website.utils.URLRewritingStream;
import java.lang.reflect.Method;
import java.util.Arrays;
@@ -280,6 +282,12 @@
return to;
}
+ public void redirect(String url) {
+ URLRewritingStream rew = Cycle.get().getRewriting();
+ url = rew.absoluteUrl(url);
+ throw new HttpRedirectException(url);
+ }
+
protected RootWebHandler root() {
return RootWebHandler.getInstance();
}
Modified: labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/WebLocalizable.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/WebLocalizable.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/WebLocalizable.java (original)
+++ labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/WebLocalizable.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.website;
import java.lang.reflect.Method;
Modified: labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/context/ContextWebMethods.aj
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/context/ContextWebMethods.aj?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/context/ContextWebMethods.aj (original)
+++ labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/context/ContextWebMethods.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.website.context;
import java.lang.reflect.Method;
Modified: labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/context/Contextualizer.aj
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/context/Contextualizer.aj?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/context/Contextualizer.aj (original)
+++ labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/context/Contextualizer.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.website.context;
import org.apache.magma.basics.context.RunningContext;
Propchange: labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/context/Contextualizer.aj
('svn:mergeinfo' removed)
Modified: labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/context/WebMethodContextElement.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/context/WebMethodContextElement.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/context/WebMethodContextElement.java (original)
+++ labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/context/WebMethodContextElement.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.website.context;
import java.lang.reflect.Method;
Modified: labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/cycle/AddURLRewritingToCycle.aj
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/cycle/AddURLRewritingToCycle.aj?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/cycle/AddURLRewritingToCycle.aj (original)
+++ labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/cycle/AddURLRewritingToCycle.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.website.cycle;
import org.apache.magma.basics.startup.Cycle;
Modified: labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/cycle/WebCycling.aj
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/cycle/WebCycling.aj?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/cycle/WebCycling.aj (original)
+++ labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/cycle/WebCycling.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.website.cycle;
import java.io.IOException;
Propchange: labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/cycle/WebCycling.aj
('svn:mergeinfo' removed)
Modified: labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/i18n/Localizer.aj
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/i18n/Localizer.aj?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/i18n/Localizer.aj (original)
+++ labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/i18n/Localizer.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.website.i18n;
import java.util.Locale;
Modified: labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/producers/TemplatingProducer.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/producers/TemplatingProducer.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/producers/TemplatingProducer.java (original)
+++ labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/producers/TemplatingProducer.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.website.producers;
import java.io.IOException;
Modified: labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/producers/TemplatingProducerFactory.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/producers/TemplatingProducerFactory.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/producers/TemplatingProducerFactory.java (original)
+++ labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/producers/TemplatingProducerFactory.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.website.producers;
import java.lang.reflect.Constructor;
Modified: labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/producers/TemplatingProducerHook.aj
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/producers/TemplatingProducerHook.aj?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/producers/TemplatingProducerHook.aj (original)
+++ labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/producers/TemplatingProducerHook.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.website.producers;
import java.beans.Introspector;
Modified: labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/templating/PreviousGiver.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/templating/PreviousGiver.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/templating/PreviousGiver.java (original)
+++ labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/templating/PreviousGiver.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.website.templating;
import org.apache.magma.website.HtmlProducer;
Modified: labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/templating/ZonePlaceholder.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/templating/ZonePlaceholder.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/templating/ZonePlaceholder.java (original)
+++ labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/templating/ZonePlaceholder.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.website.templating;
import java.util.List;
Modified: labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/templating/ZonePlaceholderCompoundSide.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/templating/ZonePlaceholderCompoundSide.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/templating/ZonePlaceholderCompoundSide.java (original)
+++ labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/templating/ZonePlaceholderCompoundSide.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.website.templating;
import java.util.List;
Modified: labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/templating/ZonePlaceholderForHtmlProducer.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/templating/ZonePlaceholderForHtmlProducer.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/templating/ZonePlaceholderForHtmlProducer.java (original)
+++ labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/templating/ZonePlaceholderForHtmlProducer.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.website.templating;
import java.util.List;
Modified: labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/utils/ExceptionProducer.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/utils/ExceptionProducer.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/utils/ExceptionProducer.java (original)
+++ labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/utils/ExceptionProducer.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.website.utils;
import java.io.IOException;
Modified: labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/utils/MakeURLRewritingContextBased.aj
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/utils/MakeURLRewritingContextBased.aj?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/utils/MakeURLRewritingContextBased.aj (original)
+++ labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/utils/MakeURLRewritingContextBased.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.website.utils;
import org.apache.magma.basics.startup.Cycle;
Modified: labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/utils/OnDemandBinder.java
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/utils/OnDemandBinder.java?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/utils/OnDemandBinder.java (original)
+++ labs/magma/branches/0.0.2/foundation-website/src/main/java/org/apache/magma/website/utils/OnDemandBinder.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.website.utils;
import java.beans.Introspector;
Modified: labs/magma/branches/0.0.2/foundation-website/src/main/resources/org/apache/magma/website/exceptions.css
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-website/src/main/resources/org/apache/magma/website/exceptions.css?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-website/src/main/resources/org/apache/magma/website/exceptions.css (original)
+++ labs/magma/branches/0.0.2/foundation-website/src/main/resources/org/apache/magma/website/exceptions.css 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.
+ */
.MagmaException {
color: black;
border: 1px solid red;
@@ -21,4 +37,4 @@
z-index: 3000;
height: auto;
width: auto;
-}
\ No newline at end of file
+}
Modified: labs/magma/branches/0.0.2/foundation-website/src/main/resources/org/apache/magma/website/falseAbsolute.css
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-website/src/main/resources/org/apache/magma/website/falseAbsolute.css?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-website/src/main/resources/org/apache/magma/website/falseAbsolute.css (original)
+++ labs/magma/branches/0.0.2/foundation-website/src/main/resources/org/apache/magma/website/falseAbsolute.css 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.
+ */
.fa-line {
display:block;
float:left;
@@ -8,4 +24,4 @@
float:left;
left:100%;
position:relative;
-}
\ No newline at end of file
+}
Modified: labs/magma/branches/0.0.2/foundation-website/src/main/resources/org/apache/magma/website/onload.js
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-website/src/main/resources/org/apache/magma/website/onload.js?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-website/src/main/resources/org/apache/magma/website/onload.js (original)
+++ labs/magma/branches/0.0.2/foundation-website/src/main/resources/org/apache/magma/website/onload.js 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.
+ */
function addOnload(func) {
var preon = window.onload;
if (!preon) {
@@ -8,4 +24,4 @@
window.setTimeout(func,1);
}
}
-}
\ No newline at end of file
+}
Modified: labs/magma/branches/0.0.2/foundation-website/src/main/resources/org/apache/magma/website/templating/defaultstyle.css
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-website/src/main/resources/org/apache/magma/website/templating/defaultstyle.css?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-website/src/main/resources/org/apache/magma/website/templating/defaultstyle.css (original)
+++ labs/magma/branches/0.0.2/foundation-website/src/main/resources/org/apache/magma/website/templating/defaultstyle.css Mon Oct 5 21:21:39 2009
@@ -1,124 +1,140 @@
-body{
- background-color: #D3D8ED;
- font-family: arial;
- margin: auto;
- text-align: center;
- font-size: 12px;
-}
-
-#container{
- margin-left: 0px;
- margin-right: 0px;
- margin-top: 19px;
- margin-bottom: 9px;
-
- padding-left: 19px;
- padding-right: 19px;
-
- float: left;
-}
-
-#ext-1 {
- background-image: url("borderLeft.png");
- background-position: left;
- background-repeat: repeat-y;
- float: left;
- padding: 0px;
- width: 100%;
-}
-#ext-2 {
- background-image: url("borderRight.png");
- background-position: right;
- background-repeat: repeat-y;
- float: left;
- padding: 0px;
- width: 100%;
-}
-#ext-3 {
- background-image: url("bottomShadow.png");
- background-position: bottom;
- background-repeat: repeat-x;
- float: left;
- padding: 0px;
- width: 100%;
-}
-#ext-4 {
- background-image: url("topShadow.png");
- background-position: top;
- background-repeat: repeat-x;
- float: left;
- padding: 0px;
- width: 100%;
-}
-#ext-5 {
- background-image: url("bottomLeft.png");
- background-position: bottom left;
- background-repeat: no-repeat;
- float: left;
- padding: 0px;
- width: 100%;
-}
-#ext-6 {
- background-image: url("bottomRight.png");
- background-position: bottom right;
- background-repeat: no-repeat;
- float: left;
- padding: 0px;
- width: 100%;
-}
-#ext-7 {
- background-image: url("extTopRt.png");
- background-position: top right;
- background-repeat: no-repeat;
- float: left;
- width: 100%;
- padding: 0px;
-}
-#ext-8 {
- background-image: url("topLeft.png");
- background-position: top left;
- background-repeat: no-repeat;
- float: left;
- padding: 0px;
- width: 100%;
-}
-#ext-9 {
- background-image: url("logoSuperior.png");
- background-position: 19px 0px;
- background-repeat: no-repeat;
- float: left;
- width: 100%;
- padding: 0px;
-}
-
-
-
-/*--------------------------------------------------------------------------------------------*/
-
-#container *{
- margin: 0px;
- border: 0px;
- text-align: left;
-}
-
-#sub-container{
- background-color: #FFFFFF;
- width: 100%;
-}
-
-/*----------- Header Informations -----------------*/
-
-#header{
- background-image: url("headerBg.png");
- background-repeat: repeat-x;
- background-position: top;
- background-color: #FFFFFF;
- width: 100%;
-}
-
-#header-container {
- margin-left: -100%;
- width: 100%;
+/*
+ * 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.
+ */
+body{
+ background-color: #D3D8ED;
+ font-family: arial;
+ margin: auto;
+ text-align: center;
+ font-size: 12px;
+}
+
+#container{
+ margin-left: 0px;
+ margin-right: 0px;
+ margin-top: 19px;
+ margin-bottom: 9px;
+
+ padding-left: 19px;
+ padding-right: 19px;
+
+ float: left;
+}
+
+#ext-1 {
+ background-image: url("borderLeft.png");
+ background-position: left;
+ background-repeat: repeat-y;
+ float: left;
+ padding: 0px;
+ width: 100%;
+}
+#ext-2 {
+ background-image: url("borderRight.png");
+ background-position: right;
+ background-repeat: repeat-y;
+ float: left;
+ padding: 0px;
+ width: 100%;
+}
+#ext-3 {
+ background-image: url("bottomShadow.png");
+ background-position: bottom;
+ background-repeat: repeat-x;
+ float: left;
+ padding: 0px;
+ width: 100%;
+}
+#ext-4 {
+ background-image: url("topShadow.png");
+ background-position: top;
+ background-repeat: repeat-x;
+ float: left;
+ padding: 0px;
+ width: 100%;
+}
+#ext-5 {
+ background-image: url("bottomLeft.png");
+ background-position: bottom left;
+ background-repeat: no-repeat;
+ float: left;
+ padding: 0px;
+ width: 100%;
+}
+#ext-6 {
+ background-image: url("bottomRight.png");
+ background-position: bottom right;
+ background-repeat: no-repeat;
+ float: left;
+ padding: 0px;
+ width: 100%;
+}
+#ext-7 {
+ background-image: url("extTopRt.png");
+ background-position: top right;
+ background-repeat: no-repeat;
+ float: left;
+ width: 100%;
+ padding: 0px;
+}
+#ext-8 {
+ background-image: url("topLeft.png");
+ background-position: top left;
+ background-repeat: no-repeat;
+ float: left;
+ padding: 0px;
+ width: 100%;
+}
+#ext-9 {
+ background-image: url("logoSuperior.png");
+ background-position: 19px 0px;
+ background-repeat: no-repeat;
+ float: left;
+ width: 100%;
+ padding: 0px;
+}
+
+
+
+/*--------------------------------------------------------------------------------------------*/
+
+#container *{
+ margin: 0px;
+ border: 0px;
+ text-align: left;
+}
+
+#sub-container{
+ background-color: #FFFFFF;
+ width: 100%;
+}
+
+/*----------- Header Informations -----------------*/
+
+#header{
+ background-image: url("headerBg.png");
+ background-repeat: repeat-x;
+ background-position: top;
+ background-color: #FFFFFF;
+ width: 100%;
+}
+
+#header-container {
+ margin-left: -100%;
+ width: 100%;
}
#logo {
@@ -135,136 +151,136 @@
margin-left: 270px;
float: left;
}
-
-/*----------------------- Boxes ----------------------*/
-
-#container div.boxes{
- background-image: url("boxesBgBottom.png");
- background-position: bottom;
- background-repeat: no-repeat;
- padding-bottom: 9px;
- margin-bottom: 10px;
- width: 205px;
-}
-
-#container div.boxes div{
- margin: 0px;
- background-image: url("boxesBg1.png");
- background-repeat: repeat-y;
- width: 205px;
- text-indent: 10px;
-}
-
-#container div.boxes div.noTitle{
- background-image: url("noTitleBg.png");
- background-position: top;
- background-repeat: no-repeat;
- width: 205px;
- padding-top: 7px;
-}
-
-
-div.boxes div *{
- margin-top: 0px;
- padding-top: 5px;
-}
-
-
-/*--------------------- Left Zone -------------------*/
-
-#left-container{
- width: 205px;
- margin-left: -100%;
-}
-
-#zoneLeft{
- margin-left: 10px;
-}
-
-/*--------------------- Main Zone ------------------------ */
-
-#main-container {
- margin-left: -100%;
- width: 100%;
-}
-
-#zoneMain{
- margin-left: 225px;
- margin-right: 240px;
-}
-
-/*----------------------- Right Zone ------------------------*/
-
-#zoneRight{
- margin-left: -225px;
- width: 205px;
-}
-
-/*--------------------------- Footer -----------------------*/
-
-#footer{
- background-image: url("footerBg1.png");
- background-position: bottom;
- background-repeat: repeat-x;
- background-color: white;
- width: 100%;
- height: 67px;
-}
-
-#littleLogo{
- margin-left: -8%;
- float: left;
-}
-/*-------------------- Other Informations ---------------*/
-
-#container div.boxes h2{
- font-size: 14px;
- color: #262662;
- text-align: center;
- margin-top: 0px;
- margin-bottom: 0px;
- padding-top: 5px;
- padding-bottom: 4px;
- background-image: url("h2BgI.png");
- background-position: top;
- background-repeat: no-repeat;
- border-bottom: 1px solid #656565;
- border-left: 0px;
- border-right: 0px;
- width: 205px;
-}
-
-#zoneMain h1{
- width: 100%;
- text-align: left;
- border-bottom: 1px solid #656565;
- margin-bottom: 10px;
- font-size: 24px;
- font-style: oblique;
- color: #262662;
-}
-
-
-#content{
- text-align: left;
- width: 100%;
-}
-
-#container ul{
- float: none;
- margin: 0px;
- padding: 0px;
-}
-
-#container li{
- list-style-type: none;
- background-image: url("liIcon.png");
- background-position: left;
- background-repeat: no-repeat;
- padding-left: 10px;
- padding-top: 0px;
- margin-left: 10px;
- margin-top: 3px;
- vertical-align: text-bottom;
-}
-
+
+/*----------------------- Boxes ----------------------*/
+
+#container div.boxes{
+ background-image: url("boxesBgBottom.png");
+ background-position: bottom;
+ background-repeat: no-repeat;
+ padding-bottom: 9px;
+ margin-bottom: 10px;
+ width: 205px;
+}
+
+#container div.boxes div{
+ margin: 0px;
+ background-image: url("boxesBg1.png");
+ background-repeat: repeat-y;
+ width: 205px;
+ text-indent: 10px;
+}
+
+#container div.boxes div.noTitle{
+ background-image: url("noTitleBg.png");
+ background-position: top;
+ background-repeat: no-repeat;
+ width: 205px;
+ padding-top: 7px;
+}
+
+
+div.boxes div *{
+ margin-top: 0px;
+ padding-top: 5px;
+}
+
+
+/*--------------------- Left Zone -------------------*/
+
+#left-container{
+ width: 205px;
+ margin-left: -100%;
+}
+
+#zoneLeft{
+ margin-left: 10px;
+}
+
+/*--------------------- Main Zone ------------------------ */
+
+#main-container {
+ margin-left: -100%;
+ width: 100%;
+}
+
+#zoneMain{
+ margin-left: 225px;
+ margin-right: 240px;
+}
+
+/*----------------------- Right Zone ------------------------*/
+
+#zoneRight{
+ margin-left: -225px;
+ width: 205px;
+}
+
+/*--------------------------- Footer -----------------------*/
+
+#footer{
+ background-image: url("footerBg1.png");
+ background-position: bottom;
+ background-repeat: repeat-x;
+ background-color: white;
+ width: 100%;
+ height: 67px;
+}
+
+#littleLogo{
+ margin-left: -8%;
+ float: left;
+}
+/*-------------------- Other Informations ---------------*/
+
+#container div.boxes h2{
+ font-size: 14px;
+ color: #262662;
+ text-align: center;
+ margin-top: 0px;
+ margin-bottom: 0px;
+ padding-top: 5px;
+ padding-bottom: 4px;
+ background-image: url("h2BgI.png");
+ background-position: top;
+ background-repeat: no-repeat;
+ border-bottom: 1px solid #656565;
+ border-left: 0px;
+ border-right: 0px;
+ width: 205px;
+}
+
+#zoneMain h1{
+ width: 100%;
+ text-align: left;
+ border-bottom: 1px solid #656565;
+ margin-bottom: 10px;
+ font-size: 24px;
+ font-style: oblique;
+ color: #262662;
+}
+
+
+#content{
+ text-align: left;
+ width: 100%;
+}
+
+#container ul{
+ float: none;
+ margin: 0px;
+ padding: 0px;
+}
+
+#container li{
+ list-style-type: none;
+ background-image: url("liIcon.png");
+ background-position: left;
+ background-repeat: no-repeat;
+ padding-left: 10px;
+ padding-top: 0px;
+ margin-left: 10px;
+ margin-top: 3px;
+ vertical-align: text-bottom;
+}
+
Modified: labs/magma/branches/0.0.2/foundation-website/src/main/resources/org/apache/magma/website/templating/old_defaultstyle.css
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-website/src/main/resources/org/apache/magma/website/templating/old_defaultstyle.css?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-website/src/main/resources/org/apache/magma/website/templating/old_defaultstyle.css (original)
+++ labs/magma/branches/0.0.2/foundation-website/src/main/resources/org/apache/magma/website/templating/old_defaultstyle.css 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.
+ */
* {
font-family: sans-serif;
font-size: 12px;
@@ -33,4 +49,4 @@
float: right;
width: 150px;
border-left: solid 1px gray;
-}
\ No newline at end of file
+}
Modified: labs/magma/branches/0.0.2/foundation-website/src/main/resources/org/apache/magma/website/templating/template.html
URL: http://svn.apache.org/viewvc/labs/magma/branches/0.0.2/foundation-website/src/main/resources/org/apache/magma/website/templating/template.html?rev=822022&r1=822021&r2=822022&view=diff
==============================================================================
--- labs/magma/branches/0.0.2/foundation-website/src/main/resources/org/apache/magma/website/templating/template.html (original)
+++ labs/magma/branches/0.0.2/foundation-website/src/main/resources/org/apache/magma/website/templating/template.html Mon Oct 5 21:21:39 2009
@@ -1,56 +1,72 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <link rel="stylesheet" type="text/css" href="defaultstyle.css">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!--
+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.
+-->
+<html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <link rel="stylesheet" type="text/css" href="defaultstyle.css">
<link rel="stylesheet" type="text/css" href="magma:/common/falseAbsolute.css">
- <title>Magma</title>
- </head>
- <body>
- <div id="ext-1">
- <div id="ext-2">
- <div id="ext-3">
- <div id="ext-4">
- <div id="ext-5">
- <div id="ext-6">
- <div id="ext-7">
- <div id="ext-8">
- <div id="ext-9">
- <div id="container">
- <div id="header" class="fa-line">
+ <title>Magma</title>
+ </head>
+ <body>
+ <div id="ext-1">
+ <div id="ext-2">
+ <div id="ext-3">
+ <div id="ext-4">
+ <div id="ext-5">
+ <div id="ext-6">
+ <div id="ext-7">
+ <div id="ext-8">
+ <div id="ext-9">
+ <div id="container">
+ <div id="header" class="fa-line">
<div id="header-container" class="fa-item">
- <div class="fa-line">
- <img src="logoInferior.png" id="logo" class="fa-item"/>
+ <div class="fa-line">
+ <img src="logoInferior.png" id="logo" class="fa-item"/>
<div id="header-zone-wrapper" class="fa-item">
<div id="zoneHeader"></div>
</div>
</div>
</div>
- </div>
- <div id="sub-container" class="fa-line">
- <div id="main-container" class="fa-item">
- <div id="zoneMain">
- </div>
- </div>
+ </div>
+ <div id="sub-container" class="fa-line">
+ <div id="main-container" class="fa-item">
+ <div id="zoneMain">
+ </div>
+ </div>
<div id="left-container" class="fa-item">
<div id="zoneLeft">
</div>
</div>
- <div id="zoneRight" class="fa-item">
- </div>
- </div>
- <div id="footer" class="fa-line">
- <img src="magma_m_64.png" id="littleLogo" class="fa-item">
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- </div>
- </body>
-</html>
\ No newline at end of file
+ <div id="zoneRight" class="fa-item">
+ </div>
+ </div>
+ <div id="footer" class="fa-line">
+ <img src="magma_m_64.png" id="littleLogo" class="fa-item">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </body>
+</html>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org