You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directmemory.apache.org by ol...@apache.org on 2012/02/28 19:36:02 UTC
svn commit: r1294768 [1/5] - in /incubator/directmemory/trunk: ./ examples/
examples/server-example/ examples/server-example/src/
examples/server-example/src/main/ examples/server-example/src/main/resources/
examples/server-example/src/main/webapp/ exa...
Author: olamy
Date: Tue Feb 28 18:36:00 2012
New Revision: 1294768
URL: http://svn.apache.org/viewvc?rev=1294768&view=rev
Log:
add maven layout for a server webapp sample
Added:
incubator/directmemory/trunk/examples/
incubator/directmemory/trunk/examples/pom.xml
- copied, changed from r1294766, incubator/directmemory/trunk/platforms/pom.xml
incubator/directmemory/trunk/examples/server-example/
incubator/directmemory/trunk/examples/server-example/pom.xml (with props)
incubator/directmemory/trunk/examples/server-example/src/
incubator/directmemory/trunk/examples/server-example/src/main/
incubator/directmemory/trunk/examples/server-example/src/main/resources/
incubator/directmemory/trunk/examples/server-example/src/main/resources/log4j.xml
- copied, changed from r1294766, incubator/directmemory/trunk/platforms/pom.xml
incubator/directmemory/trunk/examples/server-example/src/main/webapp/
incubator/directmemory/trunk/examples/server-example/src/main/webapp/WEB-INF/
incubator/directmemory/trunk/examples/server-example/src/main/webapp/WEB-INF/web.xml (contents, props changed)
- copied, changed from r1294766, incubator/directmemory/trunk/server/directmemory-server/src/main/webapp/WEB-INF/web.xml
incubator/directmemory/trunk/examples/server-example/src/main/webapp/css/
incubator/directmemory/trunk/examples/server-example/src/main/webapp/css/bootstrap.2.0.1.css (with props)
incubator/directmemory/trunk/examples/server-example/src/main/webapp/index.html (with props)
incubator/directmemory/trunk/examples/server-example/src/main/webapp/js/
incubator/directmemory/trunk/examples/server-example/src/main/webapp/js/bootstrap.2.0.1.js (with props)
incubator/directmemory/trunk/examples/server-example/src/main/webapp/js/jquery-1.7.1.js (with props)
Removed:
incubator/directmemory/trunk/server/directmemory-server/src/main/webapp/WEB-INF/web.xml
Modified:
incubator/directmemory/trunk/platforms/pom.xml
incubator/directmemory/trunk/pom.xml
incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/DirectMemoryServlet.java
Copied: incubator/directmemory/trunk/examples/pom.xml (from r1294766, incubator/directmemory/trunk/platforms/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/examples/pom.xml?p2=incubator/directmemory/trunk/examples/pom.xml&p1=incubator/directmemory/trunk/platforms/pom.xml&r1=1294766&r2=1294768&rev=1294768&view=diff
==============================================================================
--- incubator/directmemory/trunk/platforms/pom.xml (original)
+++ incubator/directmemory/trunk/examples/pom.xml Tue Feb 28 18:36:00 2012
@@ -22,20 +22,19 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <artifactId>directmemory-parent</artifactId>
<groupId>org.apache.directmemory</groupId>
+ <artifactId>directmemory-parent</artifactId>
<version>0.6.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.directmemory</groupId>
- <artifactId>platforms</artifactId>
+ <artifactId>examples</artifactId>
<packaging>pom</packaging>
- <name>Apache DirectMemory :: Platforms</name>
+ <name>Apache DirectMemory :: Examples</name>
<description>${project.name}</description>
<modules>
- <module>karaf</module>
+ <module>server-example</module>
</modules>
Added: incubator/directmemory/trunk/examples/server-example/pom.xml
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/examples/server-example/pom.xml?rev=1294768&view=auto
==============================================================================
--- incubator/directmemory/trunk/examples/server-example/pom.xml (added)
+++ incubator/directmemory/trunk/examples/server-example/pom.xml Tue Feb 28 18:36:00 2012
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <groupId>org.apache.directmemory</groupId>
+ <artifactId>examples</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>server-example</artifactId>
+ <packaging>war</packaging>
+ <name>Apache DirectMemory :: Examples :: Server Javascript</name>
+ <description>${project.name}</description>
+
+ <properties>
+ <tomcatRunPort>9091</tomcatRunPort>
+ <tomcatRunPath>/dm</tomcatRunPath>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.directmemory.server</groupId>
+ <artifactId>directmemory-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.16</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.tomcat.maven</groupId>
+ <artifactId>tomcat7-maven-plugin</artifactId>
+ <configuration>
+ <port>${tomcatRunPort}</port>
+ <path>${tomcatRunPath}</path>
+ <warSourceDirectory>${basedir}/src/main/webapp</warSourceDirectory>
+ <systemProperties>
+ <appserver.base>${project.build.directory}/appserver-base</appserver.base>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
Propchange: incubator/directmemory/trunk/examples/server-example/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/directmemory/trunk/examples/server-example/pom.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: incubator/directmemory/trunk/examples/server-example/src/main/resources/log4j.xml (from r1294766, incubator/directmemory/trunk/platforms/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/examples/server-example/src/main/resources/log4j.xml?p2=incubator/directmemory/trunk/examples/server-example/src/main/resources/log4j.xml&p1=incubator/directmemory/trunk/platforms/pom.xml&r1=1294766&r2=1294768&rev=1294768&view=diff
==============================================================================
--- incubator/directmemory/trunk/platforms/pom.xml (original)
+++ incubator/directmemory/trunk/examples/server-example/src/main/resources/log4j.xml Tue Feb 28 18:36:00 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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
@@ -18,25 +18,24 @@
~ under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>directmemory-parent</artifactId>
- <groupId>org.apache.directmemory</groupId>
- <version>0.6.0-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.directmemory</groupId>
- <artifactId>platforms</artifactId>
- <packaging>pom</packaging>
- <name>Apache DirectMemory :: Platforms</name>
- <description>${project.name}</description>
-
- <modules>
- <module>karaf</module>
- </modules>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-</project>
\ No newline at end of file
+ <appender name="console" class="org.apache.log4j.ConsoleAppender">
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p %c %x - %m%n"/>
+ </layout>
+ </appender>
+
+
+ <logger name="org.apache.directmemory">
+ <level value="debug"/>
+ </logger>
+
+ <root>
+ <priority value ="info" />
+ <appender-ref ref="console" />
+ </root>
+
+</log4j:configuration>
Copied: incubator/directmemory/trunk/examples/server-example/src/main/webapp/WEB-INF/web.xml (from r1294766, incubator/directmemory/trunk/server/directmemory-server/src/main/webapp/WEB-INF/web.xml)
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/examples/server-example/src/main/webapp/WEB-INF/web.xml?p2=incubator/directmemory/trunk/examples/server-example/src/main/webapp/WEB-INF/web.xml&p1=incubator/directmemory/trunk/server/directmemory-server/src/main/webapp/WEB-INF/web.xml&r1=1294766&r2=1294768&rev=1294768&view=diff
==============================================================================
--- incubator/directmemory/trunk/server/directmemory-server/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/directmemory/trunk/examples/server-example/src/main/webapp/WEB-INF/web.xml Tue Feb 28 18:36:00 2012
@@ -25,6 +25,7 @@
<servlet>
<servlet-name>DirectMemoryServlet</servlet-name>
<servlet-class>org.apache.directmemory.server.services.DirectMemoryServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
</servlet>
<servlet-mapping>
Propchange: incubator/directmemory/trunk/examples/server-example/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/directmemory/trunk/examples/server-example/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision