You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polygene.apache.org by ni...@apache.org on 2015/07/06 15:05:40 UTC
[2/5] zest-qi4j git commit: Removed CXF Removed Struts Upgraded to
Spring 4.1.7
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/122a51b6/samples/struts2Hello/src/main/java/org/qi4j/library/struts2/example/actions/AddItem.java
----------------------------------------------------------------------
diff --git a/samples/struts2Hello/src/main/java/org/qi4j/library/struts2/example/actions/AddItem.java b/samples/struts2Hello/src/main/java/org/qi4j/library/struts2/example/actions/AddItem.java
deleted file mode 100644
index 3604f1a..0000000
--- a/samples/struts2Hello/src/main/java/org/qi4j/library/struts2/example/actions/AddItem.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.qi4j.library.struts2.example.actions;
-
-import org.apache.struts2.config.Result;
-import org.apache.struts2.config.Results;
-import org.apache.struts2.dispatcher.ServletActionRedirectResult;
-import org.qi4j.api.composite.Composite;
-import org.qi4j.api.mixin.Mixins;
-import org.qi4j.library.struts2.example.Item;
-import org.qi4j.library.struts2.support.add.ProvidesAddingOf;
-import org.qi4j.library.struts2.support.add.ProvidesAddingOfMixin;
-
-@Results( {
- @Result( name = "input", value = "/jsp/addItem.jsp" ),
- @Result( name = "error", value = "/jsp/addItem.jsp" ),
- @Result( name = "success", value = "listItems", type = ServletActionRedirectResult.class )
-} )
-@Mixins( ProvidesAddingOfMixin.class )
-public interface AddItem
- extends ProvidesAddingOf<Item>, Composite
-{
-}
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/122a51b6/samples/struts2Hello/src/main/java/org/qi4j/library/struts2/example/actions/EditItem.java
----------------------------------------------------------------------
diff --git a/samples/struts2Hello/src/main/java/org/qi4j/library/struts2/example/actions/EditItem.java b/samples/struts2Hello/src/main/java/org/qi4j/library/struts2/example/actions/EditItem.java
deleted file mode 100644
index 128ea70..0000000
--- a/samples/struts2Hello/src/main/java/org/qi4j/library/struts2/example/actions/EditItem.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.qi4j.library.struts2.example.actions;
-
-import com.opensymphony.xwork2.ActionSupport;
-import org.apache.struts2.config.Result;
-import org.apache.struts2.config.Results;
-import org.apache.struts2.dispatcher.ServletActionRedirectResult;
-import org.qi4j.api.composite.Composite;
-import org.qi4j.api.mixin.Mixins;
-import org.qi4j.library.struts2.example.Item;
-import org.qi4j.library.struts2.support.ProvidesEntityOfMixin;
-import org.qi4j.library.struts2.support.edit.ProvidesEditingOf;
-import org.qi4j.library.struts2.support.edit.ProvidesEditingOfMixin;
-
-@Results( {
- @Result( name = "input", value = "/jsp/editItem.jsp" ),
- @Result( name = "error", value = "/jsp/editItem.jsp" ),
- @Result( name = "success", value = "listItems", type = ServletActionRedirectResult.class )
-} )
-@Mixins( { ProvidesEditingOfMixin.class, ProvidesEntityOfMixin.class, ActionSupport.class } )
-public interface EditItem
- extends ProvidesEditingOf<Item>, Composite
-{
-}
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/122a51b6/samples/struts2Hello/src/main/java/org/qi4j/library/struts2/example/actions/HelloWorldAction.java
----------------------------------------------------------------------
diff --git a/samples/struts2Hello/src/main/java/org/qi4j/library/struts2/example/actions/HelloWorldAction.java b/samples/struts2Hello/src/main/java/org/qi4j/library/struts2/example/actions/HelloWorldAction.java
deleted file mode 100644
index 9805936..0000000
--- a/samples/struts2Hello/src/main/java/org/qi4j/library/struts2/example/actions/HelloWorldAction.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * $Id: RequestUtils.java 394468 2006-04-16 12:16:03Z tmjee $
- *
- * Copyright 2006 The Apache Software Foundation.
- *
- * Licensed 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.qi4j.library.struts2.example.actions;
-
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.conversion.annotations.Conversion;
-import com.opensymphony.xwork2.conversion.annotations.TypeConversion;
-import com.opensymphony.xwork2.validator.annotations.RequiredFieldValidator;
-import com.opensymphony.xwork2.validator.annotations.RequiredStringValidator;
-import com.opensymphony.xwork2.validator.annotations.Validation;
-import org.apache.struts2.config.Result;
-import org.apache.struts2.config.Results;
-
-import java.util.Date;
-
-@Validation
-@Conversion
-@Results( { @Result( name = "input", value = "/jsp/index.jsp" ), @Result( value = "/jsp/helloWorld.jsp" ) } )
-public class HelloWorldAction
- extends ActionSupport
-{
-
- private static final long serialVersionUID = 1L;
-
- private Date now;
- private String name;
-
- @TypeConversion( converter = "org.qi4j.library.struts2.example.converters.DateConverter" )
- @RequiredFieldValidator( message = "Please enter the date" )
- public void setDateNow( Date dateNow )
- {
- now = dateNow;
- }
-
- public Date getDateNow()
- {
- return now;
- }
-
- @RequiredStringValidator( message = "Please enter a name", trim = true )
- public void setName( String userName )
- {
- name = userName;
- }
-
- public String getName()
- {
- return name;
- }
-
- @Override
- public String execute()
- throws Exception
- {
- return SUCCESS;
- }
-}
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/122a51b6/samples/struts2Hello/src/main/java/org/qi4j/library/struts2/example/actions/IndexAction.java
----------------------------------------------------------------------
diff --git a/samples/struts2Hello/src/main/java/org/qi4j/library/struts2/example/actions/IndexAction.java b/samples/struts2Hello/src/main/java/org/qi4j/library/struts2/example/actions/IndexAction.java
deleted file mode 100644
index 49a0c52..0000000
--- a/samples/struts2Hello/src/main/java/org/qi4j/library/struts2/example/actions/IndexAction.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * $Id: RequestUtils.java 394468 2006-04-16 12:16:03Z tmjee $
- *
- * Copyright 2006 The Apache Software Foundation.
- *
- * Licensed 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.qi4j.library.struts2.example.actions;
-
-import com.opensymphony.xwork2.ActionSupport;
-import com.opensymphony.xwork2.conversion.annotations.Conversion;
-import com.opensymphony.xwork2.conversion.annotations.TypeConversion;
-import org.apache.struts2.config.Result;
-import org.qi4j.api.injection.scope.Structure;
-import org.qi4j.api.structure.Module;
-
-import java.util.Date;
-
-@Conversion
-@Result( value = "/jsp/index.jsp" )
-public class IndexAction
- extends ActionSupport
-{
-
- private static final long serialVersionUID = 1L;
-
- @Structure
- private Module module;
-
- private Date now;
-
- public IndexAction()
- {
- now = new Date();
- }
-
- @TypeConversion( converter = "org.qi4j.library.struts2.example.converters.DateConverter" )
- public Date getDateNow()
- {
- return now;
- }
-
- public String getModuleName()
- {
- return module.name();
- }
-
- @Override
- public String execute()
- throws Exception
- {
- now = new Date();
- return SUCCESS;
- }
-}
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/122a51b6/samples/struts2Hello/src/main/java/org/qi4j/library/struts2/example/actions/ListItems.java
----------------------------------------------------------------------
diff --git a/samples/struts2Hello/src/main/java/org/qi4j/library/struts2/example/actions/ListItems.java b/samples/struts2Hello/src/main/java/org/qi4j/library/struts2/example/actions/ListItems.java
deleted file mode 100644
index 989fd6d..0000000
--- a/samples/struts2Hello/src/main/java/org/qi4j/library/struts2/example/actions/ListItems.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.qi4j.library.struts2.example.actions;
-
-import org.apache.struts2.config.Result;
-import org.apache.struts2.config.Results;
-import org.qi4j.api.composite.Composite;
-import org.qi4j.api.mixin.Mixins;
-import org.qi4j.library.struts2.example.Item;
-import org.qi4j.library.struts2.support.list.ProvidesListOf;
-import org.qi4j.library.struts2.support.list.ProvidesListOfMixin;
-
-@Results( {
- @Result( name = "success", value = "/jsp/listItems.jsp" )
-} )
-@Mixins( ProvidesListOfMixin.class )
-public interface ListItems
- extends ProvidesListOf<Item>, Composite
-{
-}
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/122a51b6/samples/struts2Hello/src/main/java/org/qi4j/library/struts2/example/converters/DateConverter.java
----------------------------------------------------------------------
diff --git a/samples/struts2Hello/src/main/java/org/qi4j/library/struts2/example/converters/DateConverter.java b/samples/struts2Hello/src/main/java/org/qi4j/library/struts2/example/converters/DateConverter.java
deleted file mode 100644
index 1a28fb3..0000000
--- a/samples/struts2Hello/src/main/java/org/qi4j/library/struts2/example/converters/DateConverter.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * $Id: RequestUtils.java 394468 2006-04-16 12:16:03Z tmjee $
- *
- * Copyright 2006 The Apache Software Foundation.
- *
- * Licensed 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.qi4j.library.struts2.example.converters;
-
-import org.apache.struts2.util.StrutsTypeConverter;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Map;
-
-public class DateConverter
- extends StrutsTypeConverter
-{
- @Override
- public final Object convertFromString( Map context, String[] values, Class toClass )
- {
- if( values != null && values.length > 0 && values[ 0 ] != null && values[ 0 ].length() > 0 )
- {
- SimpleDateFormat sdf = new SimpleDateFormat( "yyyy/MM/dd" );
- try
- {
- return sdf.parse( values[ 0 ] );
- }
- catch( ParseException e )
- {
- throw new IllegalArgumentException( "Parse [" + values[ 0 ] + "] do date fail.", e );
- }
- }
- return null;
- }
-
- @Override
- public String convertToString( Map context, Object o )
- {
- if( o instanceof Date )
- {
- SimpleDateFormat sdf = new SimpleDateFormat( "yyyy/MM/dd" );
- return sdf.format( (Date) o );
- }
- return "";
- }
-}
-
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/122a51b6/samples/struts2Hello/src/main/java/org/qi4j/library/struts2/example/listener/ExampleBootstrapListener.java
----------------------------------------------------------------------
diff --git a/samples/struts2Hello/src/main/java/org/qi4j/library/struts2/example/listener/ExampleBootstrapListener.java b/samples/struts2Hello/src/main/java/org/qi4j/library/struts2/example/listener/ExampleBootstrapListener.java
deleted file mode 100644
index dcb8d36..0000000
--- a/samples/struts2Hello/src/main/java/org/qi4j/library/struts2/example/listener/ExampleBootstrapListener.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/* Copyright 2008 Edward Yakop.
- *
- * Licensed 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.qi4j.library.struts2.example.listener;
-
-import org.qi4j.api.structure.Application;
-import org.qi4j.api.structure.Module;
-import org.qi4j.bootstrap.*;
-import org.qi4j.entitystore.memory.MemoryEntityStoreService;
-import org.qi4j.index.rdf.RdfIndexingEngineService;
-import org.qi4j.library.rdf.entity.EntityStateSerializer;
-import org.qi4j.library.rdf.repository.MemoryRepositoryService;
-import org.qi4j.library.struts2.ActionConfiguration;
-import org.qi4j.library.struts2.Qi4jApplicationBootstrapListener;
-import org.qi4j.library.struts2.bootstrap.Struts2PluginAssembler;
-import org.qi4j.library.struts2.codebehind.bootstrap.CodebehindAssembler;
-import org.qi4j.library.struts2.example.Item;
-import org.qi4j.library.struts2.example.actions.*;
-import org.qi4j.spi.uuid.UuidIdentityGeneratorService;
-
-/**
- * @author edward.yakop@gmail.com
- */
-public class ExampleBootstrapListener
- extends Qi4jApplicationBootstrapListener
-{
- @Override
- protected final ApplicationAssembler createAssembler()
- {
- return new ApplicationAssembler()
- {
- public ApplicationAssembly assemble( ApplicationAssemblyFactory applicationFactory )
- throws AssemblyException
- {
- return applicationFactory.newApplicationAssembly( new Assembler()
- {
- public void assemble( ModuleAssembly aModule )
- throws AssemblyException
- {
- ActionConfiguration actionConfiguration = new ActionConfiguration();
- actionConfiguration.addObjects( HelloWorldAction.class, IndexAction.class );
- actionConfiguration.addComposites( AddItem.class, EditItem.class, ListItems.class );
-
- new Struts2PluginAssembler( actionConfiguration ).assemble( aModule );
- new CodebehindAssembler().assemble( aModule );
-
- aModule.entities( Item.class );
- aModule.services(
- MemoryEntityStoreService.class,
- UuidIdentityGeneratorService.class,
- MemoryRepositoryService.class,
- RdfIndexingEngineService.class
- );
- aModule.objects( EntityStateSerializer.class );
- }
- } );
- }
- };
- }
-
- @Override
- protected final Module qi4jStrutsModule( Application application )
- {
- return application.findModule( "Layer 1", "Module 1" );
- }
-}
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/122a51b6/samples/struts2Hello/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/samples/struts2Hello/src/main/resources/log4j.properties b/samples/struts2Hello/src/main/resources/log4j.properties
deleted file mode 100644
index eb69425..0000000
--- a/samples/struts2Hello/src/main/resources/log4j.properties
+++ /dev/null
@@ -1,30 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-log4j.rootLogger = DEBUG, stdout
-
-log4j.category.com.opensymphony.sitemesh=DEBUG
-log4j.category.org.apache.struts2=INFO
-log4j.category.org.apache=INFO
-log4j.category.catalia=INFO
-
-log4j.appender.stdout = org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.Threshold = DEBUG
-log4j.appender.stdout.Target = System.out
-log4j.appender.stdout.layout = org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern = %d{ISO8601} %-5p [%F:%L] : %m%n
-
-
-
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/122a51b6/samples/struts2Hello/src/main/resources/struts.properties
----------------------------------------------------------------------
diff --git a/samples/struts2Hello/src/main/resources/struts.properties b/samples/struts2Hello/src/main/resources/struts.properties
deleted file mode 100644
index 00dab45..0000000
--- a/samples/struts2Hello/src/main/resources/struts.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# struts.configuration=org.apache.struts2.config.DefaultConfiguration
-
-# struts.locale=en_US
-struts.i18n.encoding=UTF-8
-
-struts.objectFactory=qi4j
-struts.objectTypeDeterminer=tiger
-
-struts.mapper.class=org.apache.struts2.dispatcher.mapper.DefaultActionMapper
-
-# Make sure this is set to false during deployment
-# development mode
-struts.devMode = true
-struts.i18n.reload=true
-struts.configuration.xml.reload=true
-# end development mode
-
-#struts.url.http.port = 80
-#struts.url.https.port = 443
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/122a51b6/samples/struts2Hello/src/main/resources/struts.xml
----------------------------------------------------------------------
diff --git a/samples/struts2Hello/src/main/resources/struts.xml b/samples/struts2Hello/src/main/resources/struts.xml
deleted file mode 100644
index 6fc40d1..0000000
--- a/samples/struts2Hello/src/main/resources/struts.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<!DOCTYPE struts PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN"
- "http://struts.apache.org/dtds/struts-2.0.dtd">
-<!--
- 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.
--->
-<struts>
- <constant name="struts.configuration.classpath.disableActionScanning" value="true"/>
- <constant name="struts.configuration.classpath.defaultParentPackage" value="example-base"/>
-
- <package name="example-base" extends="struts-default">
- <interceptors>
- <interceptor name="constraintViolation" class="org.qi4j.library.struts2.ConstraintViolationInterceptor"/>
- <interceptor name="unitOfWork" class="org.qi4j.library.struts2.UnitOfWorkInterceptor"/>
-
- <interceptor-stack name="exampleStack">
- <interceptor-ref name="exception"/>
- <interceptor-ref name="params"/>
- <interceptor-ref name="servletConfig"/>
- <interceptor-ref name="unitOfWork"/>
- <interceptor-ref name="prepare"/>
- <interceptor-ref name="i18n"/>
- <interceptor-ref name="debugging"/>
- <interceptor-ref name="profiling"/>
- <interceptor-ref name="checkbox"/>
- <interceptor-ref name="staticParams"/>
- <interceptor-ref name="params"/>
- <interceptor-ref name="conversionError"/>
- <interceptor-ref name="constraintViolation"/>
- <interceptor-ref name="validation">
- <param name="excludeMethods">input,back,cancel,browse</param>
- </interceptor-ref>
- <interceptor-ref name="workflow">
- <param name="excludeMethods">input,back,cancel,browse</param>
- </interceptor-ref>
- </interceptor-stack>
- </interceptors>
-
- <default-interceptor-ref name="exampleStack"/>
-
- <default-action-ref name="index"/>
- </package>
-</struts>
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/122a51b6/samples/struts2Hello/src/main/webapp/WEB-INF/decorators.xml
----------------------------------------------------------------------
diff --git a/samples/struts2Hello/src/main/webapp/WEB-INF/decorators.xml b/samples/struts2Hello/src/main/webapp/WEB-INF/decorators.xml
deleted file mode 100644
index fe9f6d5..0000000
--- a/samples/struts2Hello/src/main/webapp/WEB-INF/decorators.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- 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.
--->
-<decorators defaultdir="/WEB-INF/decorators">
- <!-- Any urls that are excluded will never be decorated by Sitemesh -->
- <excludes>
- <pattern>/nodecorate/*</pattern>
- <pattern>/styles/*</pattern>
- <pattern>/scripts/*</pattern>
- <pattern>/images/*</pattern>
- <pattern>/dojo/*</pattern>
- <pattern>/struts/*</pattern>
- </excludes>
-
- <decorator name="main" page="main.jsp">
- <pattern>/*</pattern>
- </decorator>
-
-</decorators>
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/122a51b6/samples/struts2Hello/src/main/webapp/WEB-INF/decorators/main.jsp
----------------------------------------------------------------------
diff --git a/samples/struts2Hello/src/main/webapp/WEB-INF/decorators/main.jsp b/samples/struts2Hello/src/main/webapp/WEB-INF/decorators/main.jsp
deleted file mode 100644
index d79e21b..0000000
--- a/samples/struts2Hello/src/main/webapp/WEB-INF/decorators/main.jsp
+++ /dev/null
@@ -1,91 +0,0 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
---%>
-<!DOCTYPE html PUBLIC
-"-//W3C//DTD XHTML 1.1 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
-<%@taglib prefix="decorator" uri="http://www.opensymphony.com/sitemesh/decorator" %>
-<%@taglib prefix="page" uri="http://www.opensymphony.com/sitemesh/page" %>
-<%@taglib prefix="s" uri="/struts-tags" %>
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
- <title><decorator:title default="Struts Starter"/></title>
- <link href="<s:url value='/styles/main.css'/>" rel="stylesheet" type="text/css" media="all"/>
- <link href="<s:url value='/struts/niftycorners/niftyCorners.css'/>" rel="stylesheet" type="text/css"/>
- <link href="<s:url value='/struts/niftycorners/niftyPrint.css'/>" rel="stylesheet" type="text/css" media="print"/>
- <decorator:head/>
-</head>
-<body id="page-home">
-<div id="page">
- <div id="header" class="clearfix">
- HEADER
- <hr/>
- </div>
-
- <div id="content" class="clearfix">
- <div id="main">
- <h3>Main Content</h3>
- <decorator:body/>
- <hr/>
- </div>
-
- <div id="sub">
- <h3>Sub Content</h3>
- </div>
-
-
- <div id="local">
- <h3>Local Nav. Bar</h3>
- <ul>
- <li><a href="#">Content page 1</a></li>
- <li><a href="#">Content page 2</a></li>
- <li><a href="#">Content page 3</a></li>
- <li><a href="#">Content page 4</a></li>
- <li><a href="#">Content page 5</a></li>
- <li><a href="#">Content page 6</a></li>
- </ul>
- </div>
-
-
- <div id="nav">
- <div class="wrapper">
- <h3>Nav. bar</h3>
- <ul class="clearfix">
- <li><a href="#">Menu 1</a></li>
- <li><a href="#">Menu 2</a></li>
- <li><a href="#">Menu 3</a></li>
- <li><a href="#">Menu 4</a></li>
- <li><a href="#">Menu 5</a></li>
- <li class="last"><a href="#">Menu 6</a></li>
- </ul>
- </div>
- <hr/>
- </div>
- </div>
-
- <div id="footer" class="clearfix">
- Footer
- </div>
-
-</div>
-
-<div id="extra1"> </div>
-<div id="extra2"> </div>
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/122a51b6/samples/struts2Hello/src/main/webapp/WEB-INF/dwr.xml
----------------------------------------------------------------------
diff --git a/samples/struts2Hello/src/main/webapp/WEB-INF/dwr.xml b/samples/struts2Hello/src/main/webapp/WEB-INF/dwr.xml
deleted file mode 100644
index 1ed0900..0000000
--- a/samples/struts2Hello/src/main/webapp/WEB-INF/dwr.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE dwr PUBLIC "-//GetAhead Limited//DTD Direct Web Remoting 1.0//EN" "http://www.getahead.ltd.uk/dwr/dwr10.dtd">
-<!--
- 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.
--->
-<dwr>
- <allow>
- <create creator="new" javascript="validator">
- <param name="class" value="org.apache.struts2.validators.DWRValidator"/>
- </create>
- <convert converter="bean" match="com.opensymphony.xwork2.ValidationAwareSupport"/>
- </allow>
-
- <signatures>
- <![CDATA[
- import java.util.Map;
- import org.apache.struts2.validators.DWRValidator;
-
- DWRValidator.doPost(String, String, Map<String, String>);
- ]]>
- </signatures>
-</dwr>
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/122a51b6/samples/struts2Hello/src/main/webapp/WEB-INF/sitemesh.xml
----------------------------------------------------------------------
diff --git a/samples/struts2Hello/src/main/webapp/WEB-INF/sitemesh.xml b/samples/struts2Hello/src/main/webapp/WEB-INF/sitemesh.xml
deleted file mode 100644
index e0112aa..0000000
--- a/samples/struts2Hello/src/main/webapp/WEB-INF/sitemesh.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<sitemesh>
- <property name="decorators-file" value="/WEB-INF/decorators.xml"/>
- <excludes file="${decorators-file}"/>
-
- <page-parsers>
- <parser content-type="text/html" class="com.opensymphony.module.sitemesh.parser.FastPageParser"/>
- </page-parsers>
-
- <decorator-mappers>
-
- <mapper class="com.opensymphony.module.sitemesh.mapper.PageDecoratorMapper">
- <param name="property.1" value="meta.decorator"/>
- <param name="property.2" value="decorator"/>
- </mapper>
-
- <mapper class="com.opensymphony.module.sitemesh.mapper.FrameSetDecoratorMapper">
- </mapper>
-
- <mapper class="com.opensymphony.module.sitemesh.mapper.AgentDecoratorMapper">
- <param name="match.MSIE" value="ie"/>
- <param name="match.Mozilla [" value="ns"/>
- <param name="match.Opera" value="opera"/>
- <param name="match.Lynx" value="lynx"/>
- </mapper>
-
- <mapper class="com.opensymphony.module.sitemesh.mapper.PrintableDecoratorMapper">
- <param name="decorator" value="printable"/>
- <param name="parameter.name" value="printable"/>
- <param name="parameter.value" value="true"/>
- </mapper>
-
- <mapper class="com.opensymphony.module.sitemesh.mapper.RobotDecoratorMapper">
- <param name="decorator" value="robot"/>
- </mapper>
-
- <mapper class="com.opensymphony.module.sitemesh.mapper.ParameterDecoratorMapper">
- <param name="decorator.parameter" value="decorator"/>
- <param name="parameter.name" value="confirm"/>
- <param name="parameter.value" value="true"/>
- </mapper>
-
- <mapper class="com.opensymphony.module.sitemesh.mapper.ConfigDecoratorMapper">
- <param name="config" value="${decorators-file}"/>
- </mapper>
-
- </decorator-mappers>
-
-</sitemesh>
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/122a51b6/samples/struts2Hello/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/samples/struts2Hello/src/main/webapp/WEB-INF/web.xml b/samples/struts2Hello/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 416c9ce..0000000
--- a/samples/struts2Hello/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<web-app id="starter" version="2.4"
- xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-
- <display-name>Qi4j - Struts 2 Example</display-name>
-
- <!-- Listeners -->
- <listener>
- <listener-class>org.qi4j.library.struts2.example.listener.ExampleBootstrapListener</listener-class>
- </listener>
-
- <!-- Filters -->
- <filter>
- <filter-name>action2-cleanup</filter-name>
- <filter-class>org.apache.struts2.dispatcher.ActionContextCleanUp</filter-class>
- </filter>
- <filter>
- <filter-name>sitemesh</filter-name>
- <filter-class>com.opensymphony.module.sitemesh.filter.PageFilter</filter-class>
- </filter>
- <filter>
- <filter-name>action2</filter-name>
- <filter-class>org.qi4j.library.struts2.Qi4jFilterDispatcher</filter-class>
- <init-param>
- <param-name>actionPackages</param-name>
- <param-value>org.qi4j.library.struts2.example.actions</param-value>
- </init-param>
- </filter>
-
- <filter-mapping>
- <filter-name>action2-cleanup</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>sitemesh</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>action2</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
- <!-- Servlets -->
- <servlet>
- <servlet-name>dwr</servlet-name>
- <servlet-class>org.directwebremoting.servlet.DwrServlet</servlet-class>
- <init-param>
- <param-name>debug</param-name>
- <param-value>true</param-value>
- </init-param>
- </servlet>
- <servlet>
- <servlet-name>jspSupportServlet</servlet-name>
- <servlet-class>org.apache.struts2.views.JspSupportServlet</servlet-class>
- <load-on-startup>5</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>dwr</servlet-name>
- <url-pattern>/dwr/*</url-pattern>
- </servlet-mapping>
-
- <!-- Welcome file lists -->
- <welcome-file-list>
- <welcome-file>index.jsp</welcome-file>
- </welcome-file-list>
-</web-app>
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/122a51b6/samples/struts2Hello/src/main/webapp/index.jsp
----------------------------------------------------------------------
diff --git a/samples/struts2Hello/src/main/webapp/index.jsp b/samples/struts2Hello/src/main/webapp/index.jsp
deleted file mode 100644
index f0100d3..0000000
--- a/samples/struts2Hello/src/main/webapp/index.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
---%>
-<% response.sendRedirect( "index.action" ); %>
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/122a51b6/samples/struts2Hello/src/main/webapp/jsp/addItem.jsp
----------------------------------------------------------------------
diff --git a/samples/struts2Hello/src/main/webapp/jsp/addItem.jsp b/samples/struts2Hello/src/main/webapp/jsp/addItem.jsp
deleted file mode 100644
index aac5ba4..0000000
--- a/samples/struts2Hello/src/main/webapp/jsp/addItem.jsp
+++ /dev/null
@@ -1,31 +0,0 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
---%>
-<%@ taglib prefix="s" uri="/struts-tags" %>
-
-<html>
-<head>
- <title>Add Item</title>
-</head>
-<body>
-<s:actionmessage/>
-<s:form>
- <s:textfield name="state.name"/>
- <s:submit/>
-</s:form>
-</body>
-</html>
-
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/122a51b6/samples/struts2Hello/src/main/webapp/jsp/editItem.jsp
----------------------------------------------------------------------
diff --git a/samples/struts2Hello/src/main/webapp/jsp/editItem.jsp b/samples/struts2Hello/src/main/webapp/jsp/editItem.jsp
deleted file mode 100644
index 23edb26..0000000
--- a/samples/struts2Hello/src/main/webapp/jsp/editItem.jsp
+++ /dev/null
@@ -1,31 +0,0 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
---%>
-<%@ taglib prefix="s" uri="/struts-tags" %>
-
-<html>
-<head>
- <title>Edit Item</title>
-</head>
-<body>
-<s:form>
- <s:textfield name="entity.name"/>
- <s:hidden name="id"/>
- <s:submit/>
-</s:form>
-</body>
-</html>
-
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/122a51b6/samples/struts2Hello/src/main/webapp/jsp/helloWorld.jsp
----------------------------------------------------------------------
diff --git a/samples/struts2Hello/src/main/webapp/jsp/helloWorld.jsp b/samples/struts2Hello/src/main/webapp/jsp/helloWorld.jsp
deleted file mode 100644
index 197c92a..0000000
--- a/samples/struts2Hello/src/main/webapp/jsp/helloWorld.jsp
+++ /dev/null
@@ -1,31 +0,0 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
---%>
-<!DOCTYPE html PUBLIC
-"-//W3C//DTD XHTML 1.1 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<%@taglib prefix="s" uri="/struts-tags" %>
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
- <title>Hello World</title>
- <s:head/>
-</head>
-<body>
-<span>Hello <s:property value="name"/>, today is <s:property value="dateNow"/></span><br/>
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/122a51b6/samples/struts2Hello/src/main/webapp/jsp/index.jsp
----------------------------------------------------------------------
diff --git a/samples/struts2Hello/src/main/webapp/jsp/index.jsp b/samples/struts2Hello/src/main/webapp/jsp/index.jsp
deleted file mode 100644
index db5ba7a..0000000
--- a/samples/struts2Hello/src/main/webapp/jsp/index.jsp
+++ /dev/null
@@ -1,33 +0,0 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
---%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<%@taglib prefix="s" uri="/struts-tags" %>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
- <title>Index</title>
- <s:head/>
-</head>
-<body>
-<s:form action="helloWorld">
- <s:textfield label="Qi4j-Module name" name="moduleName" disabled="true"/>
- <s:textfield label="What is your name?" name="name"/>
- <s:textfield label="What is the date?" name="dateNow"/>
- <s:submit/>
-</s:form>
-</body>
-</html>
-
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/122a51b6/samples/struts2Hello/src/main/webapp/jsp/listItems.jsp
----------------------------------------------------------------------
diff --git a/samples/struts2Hello/src/main/webapp/jsp/listItems.jsp b/samples/struts2Hello/src/main/webapp/jsp/listItems.jsp
deleted file mode 100644
index ec31aac..0000000
--- a/samples/struts2Hello/src/main/webapp/jsp/listItems.jsp
+++ /dev/null
@@ -1,36 +0,0 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
---%>
-<%@ taglib prefix="s" uri="/struts-tags" %>
-
-<html>
-<head>
- <title>Item List</title>
-</head>
-<body>
-Items:
-<ul>
- <s:iterator value="list().iterator()">
- <li>
- <s:property value="name()"/>
- <a href="<s:url action="editItem" method="input"><s:param name="id" value="identity().get()" /></s:url>">Edit</a>
- </li>
- </s:iterator>
-</ul>
-<a href="<s:url action="addItem" method="input" />">Add</a>
-</body>
-</html>
-
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/122a51b6/samples/struts2Hello/src/main/webapp/styles/forms.css
----------------------------------------------------------------------
diff --git a/samples/struts2Hello/src/main/webapp/styles/forms.css b/samples/struts2Hello/src/main/webapp/styles/forms.css
deleted file mode 100644
index 6b3cc9d..0000000
--- a/samples/struts2Hello/src/main/webapp/styles/forms.css
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
-Copyright (c) 2005, Mike Stenhouse of Content with Style
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/* FORM ELEMENTS */
-form
-{
- margin: 0;
- padding: 0;
-}
-
-form div,
-form p
-{
- font-size: 1em;
- margin: 0 0 1em 0;
- padding: 0;
-}
-
-label
-{
- font-weight: bold;
-}
-
-fieldset
-{
- border: 1px solid #eee;
- padding: 5px 10px;
- margin: 0 0 1.5em 0;
-}
-
-fieldset legend
-{
- color: #666;
- font-size: 1.1em;
- font-weight: bold;
- margin: 0 0 0 0px;
- padding: 0;
- background-color: white;
-}
-
-* html fieldset legend
-{
- margin: 0 0 10px -10px;
-}
-
-fieldset ul
-{
- list-style: none;
- margin: 0 0 1.5em 0;
- padding: 0;
-}
-
-fieldset ul li
-{
- list-style: none;
- margin: 0 0 0.5em 0;
- padding: 0;
-}
-
-input, select, textarea
-{
- font-size: 1em;
- font-family: arial, helvetica, verdana, sans-serif;
-
- margin: 0;
- padding: 2px;
-}
-
-input, select
-{
- vertical-align: middle;
-}
-
-textarea
-{
- width: 200px;
- height: 8em;
-}
-
-input.check
-{
- border: none;
- width: auto;
- height: auto;
- margin: 0;
-}
-
-input.radio
-{
- border: none;
- width: auto;
- height: auto;
- margin: 0;
-}
-
-input.file
-{
- height: auto;
- width: 250px;
-}
-
-input.readonly
-{
- background-color: transparent;
- border: none;
-}
-
-input.button
-{
- width: 10em;
- border: 1px solid black;
- background-color: #ddd;
-}
-
-input.image
-{
- border: none;
- width: auto;
- height: auto;
-}
-
-form div.submit
-{
- margin: 1em 0;
-}
-
-form div.submit input
-{
- height: 2em;
- width: 15em;
-}
-
-/* END FORM ELEMENTS */
-
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/122a51b6/samples/struts2Hello/src/main/webapp/styles/layout-1col.css
----------------------------------------------------------------------
diff --git a/samples/struts2Hello/src/main/webapp/styles/layout-1col.css b/samples/struts2Hello/src/main/webapp/styles/layout-1col.css
deleted file mode 100644
index 1f15124..0000000
--- a/samples/struts2Hello/src/main/webapp/styles/layout-1col.css
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-Copyright (c) 2005, Mike Stenhouse of Content with Style
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-@import url("nav-horizontal.css");
-
-/* NAV BAR AT THE TOP AND ONE COLUMN OF CONTENT */
-div#content
-{
- position: relative;
- width: 701px;
-
- margin: 0 auto 20px auto;
- padding: 0;
-
- text-align: left;
-}
-
-div#main
-{
- width: 100%;
-}
-
-div#local
-{
- display: none;
-}
-
-div#sub
-{
- display: none;
-}
-
-div#nav
-{
- display: none;
-}
-
-/* END CONTENT */
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/122a51b6/samples/struts2Hello/src/main/webapp/styles/layout-navleft-1col.css
----------------------------------------------------------------------
diff --git a/samples/struts2Hello/src/main/webapp/styles/layout-navleft-1col.css b/samples/struts2Hello/src/main/webapp/styles/layout-navleft-1col.css
deleted file mode 100644
index b27613c..0000000
--- a/samples/struts2Hello/src/main/webapp/styles/layout-navleft-1col.css
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-Copyright (c) 2005, Mike Stenhouse of Content with Style
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-@import url("nav-vertical.css");
-
-/* NAV BAR ON THE LEFT AND ONE COLUMN OF CONTENT */
-div#content
-{
- position: relative;
- width: 780px;
-
- margin: 0 auto 20px auto;
- padding: 0;
-
- text-align: left;
-}
-
-div#main
-{
- float: right;
- width: 560px;
- display: inline;
-}
-
-div#local
-{
- display: none;
-}
-
-div#sub
-{
- display: none;
-}
-
-div#nav
-{
- float: left;
- width: 200px;
- display: inline;
-}
-
-/* END CONTENT */
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/122a51b6/samples/struts2Hello/src/main/webapp/styles/layout-navleft-2col.css
----------------------------------------------------------------------
diff --git a/samples/struts2Hello/src/main/webapp/styles/layout-navleft-2col.css b/samples/struts2Hello/src/main/webapp/styles/layout-navleft-2col.css
deleted file mode 100644
index 31d9f40..0000000
--- a/samples/struts2Hello/src/main/webapp/styles/layout-navleft-2col.css
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-Copyright (c) 2005, Mike Stenhouse of Content with Style
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-@import url("nav-vertical.css");
-
-/* NAV BAR ON THE LEFT AND TWO COLUMNS OF CONTENT */
-div#content
-{
- position: relative;
- width: 780px;
-
- margin: 0 auto 20px auto;
- padding: 0;
-
- text-align: left;
-}
-
-div#main
-{
- float: right;
- width: 340px;
- display: inline;
-
- margin-right: 220px;
- margin-left: -220px;
-}
-
-div#local
-{
- display: none;
-}
-
-div#sub
-{
- float: right;
- width: 200px;
- display: inline;
-
- margin-right: -340px;
- margin-left: 200px;
-}
-
-div#nav
-{
- float: left;
- width: 200px;
- display: inline;
-}
-
-/* END CONTENT */
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/122a51b6/samples/struts2Hello/src/main/webapp/styles/layout-navtop-1col.css
----------------------------------------------------------------------
diff --git a/samples/struts2Hello/src/main/webapp/styles/layout-navtop-1col.css b/samples/struts2Hello/src/main/webapp/styles/layout-navtop-1col.css
deleted file mode 100644
index c3ad08a..0000000
--- a/samples/struts2Hello/src/main/webapp/styles/layout-navtop-1col.css
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-Copyright (c) 2005, Mike Stenhouse of Content with Style
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-@import url("nav-horizontal.css");
-
-/* NAV BAR AT THE TOP AND ONE COLUMN OF CONTENT */
-div#content
-{
- position: relative;
- width: 701px;
-
- margin: 0 auto 20px auto;
- padding: 0;
-
- text-align: left;
-}
-
-div#main
-{
- width: 100%;
-}
-
-div#local
-{
- width: 100%;
-}
-
-div#sub
-{
- width: 100%;
-}
-
-div#nav
-{
- position: absolute;
- top: -15px;
- left: 0;
- width: 100%;
-
- text-align: left;
-}
-
-/* END CONTENT */
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/122a51b6/samples/struts2Hello/src/main/webapp/styles/layout-navtop-3col.css
----------------------------------------------------------------------
diff --git a/samples/struts2Hello/src/main/webapp/styles/layout-navtop-3col.css b/samples/struts2Hello/src/main/webapp/styles/layout-navtop-3col.css
deleted file mode 100644
index ccfd7a4..0000000
--- a/samples/struts2Hello/src/main/webapp/styles/layout-navtop-3col.css
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-Copyright (c) 2005, Mike Stenhouse of Content with Style
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-@import url("nav-horizontal.css");
-
-/* NAV BAR AT THE TOP, LOCAL NAV ON THE LEFT AND TWO COLUMNS OF CONTENT */
-div#content
-{
- position: relative;
- width: 701px;
-
- margin: 0 auto 20px auto;
- padding: 0;
-
- text-align: left;
-}
-
-div#main
-{
- float: left;
- width: 300px;
- display: inline;
-
- margin-right: -200px;
- margin-left: 200px;
-}
-
-div#sub
-{
- float: right;
- width: 180px;
- display: inline;
-}
-
-div#local
-{
- float: left;
- width: 180px;
- display: inline;
-
- margin-left: -300px;
-}
-
-div#nav
-{
- position: absolute;
- top: -15px;
- left: 0;
- width: 701px;
-
- text-align: left;
-}
-
-/* END CONTENT */
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/122a51b6/samples/struts2Hello/src/main/webapp/styles/layout-navtop-localleft.css
----------------------------------------------------------------------
diff --git a/samples/struts2Hello/src/main/webapp/styles/layout-navtop-localleft.css b/samples/struts2Hello/src/main/webapp/styles/layout-navtop-localleft.css
deleted file mode 100644
index b91eb32..0000000
--- a/samples/struts2Hello/src/main/webapp/styles/layout-navtop-localleft.css
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-Copyright (c) 2005, Mike Stenhouse of Content with Style
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-@import url("nav-horizontal.css");
-
-/* NAV BAR AT THE TOP, LOCAL NAVIGATION ON THE LEFT AND ONE COLUMN OF CONTENT */
-div#content
-{
- position: relative;
- width: 701px;
-
- margin: 0 auto 20px auto;
- padding: 0;
-
- text-align: left;
-}
-
-div#main
-{
- float: right;
- width: 500px;
- display: inline;
-}
-
-div#local
-{
- float: left;
- width: 200px;
- display: inline;
-}
-
-div#sub
-{
- display: none;
-}
-
-div#nav
-{
- position: absolute;
- top: -15px;
- left: 0;
- width: 100%;
-
- text-align: left;
-}
-
-/* END CONTENT */
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/122a51b6/samples/struts2Hello/src/main/webapp/styles/layout-navtop-subright.css
----------------------------------------------------------------------
diff --git a/samples/struts2Hello/src/main/webapp/styles/layout-navtop-subright.css b/samples/struts2Hello/src/main/webapp/styles/layout-navtop-subright.css
deleted file mode 100644
index 7ae8edb..0000000
--- a/samples/struts2Hello/src/main/webapp/styles/layout-navtop-subright.css
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-Copyright (c) 2005, Mike Stenhouse of Content with Style
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-@import url("nav-horizontal.css");
-
-/* NAV BAR AT THE TOP AND TWO COLUMNS OF CONTENT */
-div#content
-{
- position: relative;
- width: 701px;
-
- margin: 0 auto 20px auto;
- padding: 0;
-
- text-align: left;
-}
-
-div#main
-{
- float: left;
- width: 480px;
- display: inline;
-}
-
-div#sub
-{
- float: right;
- width: 200px;
- display: inline;
-}
-
-div#local
-{
- display: none;
-}
-
-div#nav
-{
- position: absolute;
- top: -15px;
- left: 0;
- width: 100%;
-
- text-align: left;
-}
-
-/* END CONTENT */
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/122a51b6/samples/struts2Hello/src/main/webapp/styles/layout.css
----------------------------------------------------------------------
diff --git a/samples/struts2Hello/src/main/webapp/styles/layout.css b/samples/struts2Hello/src/main/webapp/styles/layout.css
deleted file mode 100644
index 5fe31c7..0000000
--- a/samples/struts2Hello/src/main/webapp/styles/layout.css
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
-Copyright (c) 2005, Mike Stenhouse of Content with Style
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/* SITE SPECIFIC LAYOUT */
-body
-{
- margin: 0;
- padding: 0;
-
- background: white;
-
- text-align: center;
-}
-
-div#page
-{
- width: 780px;
-
- margin: 0 auto;
- padding: 0;
-
- background: white;
- text-align: center;
-}
-
-/* HEADER */
-div#header
-{
- margin: 0 0 5em 0;
- padding: 40px 20px;
-
- color: white;
- background: black;
-
- text-align: left;
-}
-
-div#branding
-{
- float: left;
- width: 40%;
-
- margin: 0;
- padding: 10px 0 10px 20px;
-
- text-align: left;
-}
-
-div#search
-{
- float: right;
- width: 49%;
-
- margin: 0;
- padding: 16px 20px 0 0;
-
- text-align: right;
-}
-
-/* END HEADER */
-
-/* CONTENT */
-div#content
-{
-
-}
-
-/* MAIN */
-div#main
-{
-
-}
-
-/* END MAIN */
-
-/* SUB */
-div#sub
-{
-
-}
-
-/* END SUB */
-
-/* END CONTENT */
-
-/* FOOTER */
-div#footer
-{
- color: white;
- background-color: black;
-}
-
-div#footer p
-{
- font-size: 0.8em;
-
- margin: 0;
- padding: 15px;
-}
-
-/* END FOOTER */
-/* END LAYOUT */
-
-/* UL.SUBNAV */
-ul.subnav
-{
- margin: 0;
- padding: 0;
-
- font-size: 0.8em;
- list-style: none;
-}
-
-ul.subnav li
-{
- margin: 0 0 1em 0;
- padding: 0;
- list-style: none;
-}
-
-ul.subnav li a,
-ul.subnav li a:link,
-ul.subnav li a:visited,
-ul.subnav li a:active
-{
- text-decoration: none;
- font-weight: bold;
- color: black;
-}
-
-ul.subnav li a:hover
-{
- text-decoration: underline;
-}
-
-ul.subnav li strong
-{
- padding: 0 0 0 12px;
- background: url("../i/subnav-highlight.gif") left top no-repeat transparent;
-}
-
-ul.subnav li strong a,
-ul.subnav li strong a:link,
-ul.subnav li strong a:visited,
-ul.subnav li strong a:active
-{
- color: white;
- background-color: black;
-}
-
-/* END UL.SUBNAV */
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/122a51b6/samples/struts2Hello/src/main/webapp/styles/main.css
----------------------------------------------------------------------
diff --git a/samples/struts2Hello/src/main/webapp/styles/main.css b/samples/struts2Hello/src/main/webapp/styles/main.css
deleted file mode 100644
index a0740a6..0000000
--- a/samples/struts2Hello/src/main/webapp/styles/main.css
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-@import url("tools.css");
-@import url("typo.css");
-@import url("forms.css");
- /*
- Swap layout stylesheet:
- layout-navtop-localleft.css
- layout-navtop-subright.css
- layout-navtop-3col.css
- layout-navtop-1col.css
- layout-navleft-1col.css
- layout-navleft-2col.css
- */
-@import url("layout-navtop-localleft.css");
-@import url("layout.css");
-
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/122a51b6/samples/struts2Hello/src/main/webapp/styles/nav-horizontal.css
----------------------------------------------------------------------
diff --git a/samples/struts2Hello/src/main/webapp/styles/nav-horizontal.css b/samples/struts2Hello/src/main/webapp/styles/nav-horizontal.css
deleted file mode 100644
index 3b2ce89..0000000
--- a/samples/struts2Hello/src/main/webapp/styles/nav-horizontal.css
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
-Copyright (c) 2005, Mike Stenhouse of Content with Style
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/* NAV */
-div#nav
-{
- font-size: 0.8em;
-}
-
-* html div#nav
-{
-/* hide ie/mac \*/
- height: 1%; /* end hide */
-}
-
-div#nav div.wrapper
-{
- position: absolute;
- left: 0;
- bottom: 0;
- width: 100%;
-}
-
-div#nav ul
-{
- width: auto;
- width: 100%;
-
- margin: 0;
- padding: 0;
-
- line-height: 1em;
- list-style: none;
-}
-
-div#nav li
-{
- float: left;
- display: inline;
-
- list-style: none;
-
- margin: 0;
- padding: 0;
-
- line-height: 1em;
- border-right: 1px solid #aaa;
-}
-
-div#nav li.last
-{
- border-right: none;
-}
-
-div#nav a,
-div#nav a:link,
-div#nav a:active,
-div#nav a:visited
-{
- display: inline-block; /* hide from ie/mac \*/
- display: block; /* end hide */
- font-weight: bold;
- text-decoration: none;
-
- margin: 0;
- padding: 5px 38px 5px 38px;
-
- color: black;
- background: #ddd;
-}
-
-div#nav a:hover
-{
- text-decoration: underline;
-}
-
-div#nav strong
-{
- display: inline-block; /* hide from ie/mac \*/
- display: block; /* end hide */
-
- color: white;
- background: black;
-}
-
-div#nav strong a,
-div#nav strong a:link,
-div#nav strong a:active,
-div#nav strong a:visited,
-div#nav strong a:hover
-{
- color: white;
- background-color: black;
-}
-
-/* END NAV */
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/122a51b6/samples/struts2Hello/src/main/webapp/styles/nav-vertical.css
----------------------------------------------------------------------
diff --git a/samples/struts2Hello/src/main/webapp/styles/nav-vertical.css b/samples/struts2Hello/src/main/webapp/styles/nav-vertical.css
deleted file mode 100644
index 81c5505..0000000
--- a/samples/struts2Hello/src/main/webapp/styles/nav-vertical.css
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
-Copyright (c) 2005, Mike Stenhouse of Content with Style
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/* NAV */
-div#nav
-{
- font-size: 0.8em;
-}
-
-* html div#nav
-{
-/* hide ie/mac \*/
- height: 1%; /* end hide */
-}
-
-div#nav div.wrapper
-{
- width: 100%;
-
- background: #ddd;
-}
-
-div#nav ul
-{
- width: auto;
- width: 100%;
-
- margin: 0;
- padding: 0;
-
- line-height: 1em;
- list-style: none;
-}
-
-div#nav li
-{
- display: block;
-
- list-style: none;
-
- margin: 0;
- padding: 0;
-
- line-height: 1em;
-}
-
-* html div#nav li
-{
-/* hide ie/mac \*/
- height: 1%; /* end hide */
-}
-
-div#nav li.last
-{
-
-}
-
-div#nav a,
-div#nav a:link,
-div#nav a:active,
-div#nav a:visited
-{
- display: block;
-
- font-weight: bold;
- text-decoration: none;
-
- margin: 0;
- padding: 5px 10px 5px 10px;
-
- color: black;
- background: white;
-}
-
-div#nav a:hover
-{
- color: white;
- background: black;
- text-decoration: underline;
-}
-
-div#nav strong
-{
- display: block;
-
- color: white;
- background: black;
-}
-
-div#nav strong a,
-div#nav strong a:link,
-div#nav strong a:active,
-div#nav strong a:visited,
-div#nav strong a:hover
-{
- color: white;
- background-color: black;
-}
-
-/* END NAV */
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/zest-qi4j/blob/122a51b6/samples/struts2Hello/src/main/webapp/styles/tools.css
----------------------------------------------------------------------
diff --git a/samples/struts2Hello/src/main/webapp/styles/tools.css b/samples/struts2Hello/src/main/webapp/styles/tools.css
deleted file mode 100644
index 142a27e..0000000
--- a/samples/struts2Hello/src/main/webapp/styles/tools.css
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-Copyright (c) 2005, Mike Stenhouse of Content with Style
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/* clearing */
-.stretch,
-.clear
-{
- clear: both;
- height: 1px;
- margin: 0;
- padding: 0;
- font-size: 15px;
- line-height: 1px;
-}
-
-.clearfix:after
-{
- content: ".";
- display: block;
- height: 0;
- clear: both;
- visibility: hidden;
-}
-
-* html>body .clearfix
-{
- display: inline-block;
- width: 100%;
-}
-
-* html .clearfix
-{
-/* Hides from IE-mac \*/
- height: 1%; /* End hide from IE-mac */
-}
-
-/* end clearing */
-
-/* replace */
-.replace
-{
- display: block;
-
- background-repeat: no-repeat;
- background-position: left top;
- background-color: transparent;
-}
-
-/* tidy these up */
-.replace *
-{
- text-indent: -10000px;
- display: block;
-
- background-repeat: no-repeat;
- background-position: left top;
- background-color: transparent;
-}
-
-.replace a
-{
- text-indent: 0;
-}
-
-.replace a span
-{
- text-indent: -10000px;
-}
-
-/* end replace */
-
-/* accessibility */
-span.accesskey
-{
- text-decoration: none;
-}
-
-.accessibility
-{
- position: absolute;
- top: -999em;
- left: -999em;
-}
-
-/* end accessibility */
\ No newline at end of file