mud4j-commit Mailing List for mud4j
Status: Pre-Alpha
Brought to you by:
mpurland
Menu
▾
▴
mud4j-commit — All subversion repository checkins.
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(57) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(31) |
Feb
|
Mar
|
Apr
|
May
|
Jun
(20) |
Jul
|
Aug
|
Sep
(1) |
Oct
(14) |
Nov
(2) |
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
(4) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <mpu...@us...> - 2009-04-30 23:44:07
|
Revision: 164
http://mud4j.svn.sourceforge.net/mud4j/?rev=164&view=rev
Author: mpurland
Date: 2009-04-30 23:43:58 +0000 (Thu, 30 Apr 2009)
Log Message:
-----------
Updates for mud4j
Modified Paths:
--------------
trunk/mud4j/pom.xml
trunk/mud4j/project.properties
Removed Paths:
-------------
trunk/mud4j/src/site/site.xml
Modified: trunk/mud4j/pom.xml
===================================================================
--- trunk/mud4j/pom.xml 2008-03-12 21:50:26 UTC (rev 163)
+++ trunk/mud4j/pom.xml 2009-04-30 23:43:58 UTC (rev 164)
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
@@ -24,6 +23,10 @@
<enabled>false</enabled>
</releases>
</repository>
+ <repository>
+ <id>jboss</id>
+ <url>http://repository.jboss.org/maven2</url>
+ </repository>
</repositories>
<pluginRepositories>
<pluginRepository>
@@ -180,23 +183,16 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
- <!-- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changelog-plugin</artifactId>
- </plugin> -->
+ <!--
+ <plugin> <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changelog-plugin</artifactId> </plugin>
+ -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
-
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
</plugin>
<!-- Last report -->
@@ -216,7 +212,29 @@
</plugin>
</plugins>
</reporting>
-
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ </dependencies>
<build>
<plugins>
<plugin>
@@ -268,4 +286,9 @@
</resource>
</resources>
</build>
+ <properties>
+ <junit.version>4.4</junit.version>
+ <log4j.version>1.2.13</log4j.version>
+ <slf4j.version>1.5.0</slf4j.version>
+ </properties>
</project>
\ No newline at end of file
Modified: trunk/mud4j/project.properties
===================================================================
--- trunk/mud4j/project.properties 2008-03-12 21:50:26 UTC (rev 163)
+++ trunk/mud4j/project.properties 2009-04-30 23:43:58 UTC (rev 164)
@@ -31,12 +31,6 @@
# Maven username for deploying site
maven.username=mpurland
-# Properties for the site plugin
-maven.site.deploy.clean=false
-maven.site.deploy.live=true
-maven.site.deploy.method=ssh
-maven.site.failonerror=false
-
# Maven multiproject plugin
maven.multiproject.aggregateDir=projects/
maven.multiproject.basedir=${basedir}/..
@@ -62,13 +56,13 @@
# Generated dashboard xml data file
maven.dashboard.report.xml = ${maven.build.dir}/dashboard-data.xml
-# Generated dashboard main report xdoc file name (without the extension).
-# Note: The value must not include any path as the xdoc will be
+# Generated dashboard main report xdoc file name (without the extension).
+# Note: The value must not include any path as the xdoc will be
# generated in ${maven.gen.docs}.
maven.dashboard.report.xdoc = dashboard-report
-# Generated dashboard legend xdoc file name (without the extension).
-# Note: The value must not include any path as the xdoc will be
+# Generated dashboard legend xdoc file name (without the extension).
+# Note: The value must not include any path as the xdoc will be
# generated in ${maven.gen.docs}.
maven.dashboard.report.legend.xdoc = dashboard-report-legend
@@ -182,7 +176,7 @@
maven.dashboard.aggregator.cloverncloc.description = Number of non-commented lines of code
maven.dashboard.aggregator.cloverncloc.report = clover/index.html
-# Properties for the JUnit Test aggregator
+# Properties for the JUnit Test aggregator
maven.dashboard.aggregator.junittests.script = ${maven.dashboard.aggregators.dir}/junittests.jelly
maven.dashboard.aggregator.junittests.artifact = ${maven.build.dir}/TESTS-TestSuites.xml
maven.dashboard.aggregator.junittests.label = JUnit Tests
@@ -190,7 +184,7 @@
maven.dashboard.aggregator.junittests.description = Number of JUnit tests
maven.dashboard.aggregator.junittests.report = junit-report.html
-# Properties for the JUnit Failures aggregator
+# Properties for the JUnit Failures aggregator
maven.dashboard.aggregator.junitfailures.script = ${maven.dashboard.aggregators.dir}/junitfailures.jelly
maven.dashboard.aggregator.junitfailures.artifact = ${maven.build.dir}/TESTS-TestSuites.xml
maven.dashboard.aggregator.junitfailures.label = JUnit Failures
@@ -198,7 +192,7 @@
maven.dashboard.aggregator.junitfailures.description = Number of JUnit test failures
maven.dashboard.aggregator.junitfailures.report = junit-report.html
-# Properties for the JUnit Errors aggregator
+# Properties for the JUnit Errors aggregator
maven.dashboard.aggregator.juniterrors.script = ${maven.dashboard.aggregators.dir}/juniterrors.jelly
maven.dashboard.aggregator.juniterrors.artifact = ${maven.build.dir}/TESTS-TestSuites.xml
maven.dashboard.aggregator.juniterrors.label = JUnit Errors
@@ -206,7 +200,7 @@
maven.dashboard.aggregator.juniterrors.description = Number of JUnit test errors
maven.dashboard.aggregator.juniterrors.report = junit-report.html
-# Properties for the JUnit Pass Rate aggregator
+# Properties for the JUnit Pass Rate aggregator
maven.dashboard.aggregator.junitpassrate.script = ${maven.dashboard.aggregators.dir}/junitpassrate.jelly
maven.dashboard.aggregator.junitpassrate.artifact = ${maven.build.dir}/TESTS-TestSuites.xml
maven.dashboard.aggregator.junitpassrate.label = JUnit Pass Rate
@@ -214,7 +208,7 @@
maven.dashboard.aggregator.junitpassrate.description = Percentage of JUnit tests that have passed vs tests in error or failed
maven.dashboard.aggregator.junitpassrate.report = junit-report.html
-# Properties for the PMD violations aggregator
+# Properties for the PMD violations aggregator
maven.dashboard.aggregator.pmdfiles.script = ${maven.dashboard.aggregators.dir}/pmdfiles.jelly
maven.dashboard.aggregator.pmdfiles.artifact = ${maven.build.dir}/pmd-raw-report.xml
maven.dashboard.aggregator.pmdfiles.label = PMD Files with Violations
@@ -222,7 +216,7 @@
maven.dashboard.aggregator.pmdfiles.description = Number of files with PMD violations
maven.dashboard.aggregator.pmdfiles.report = pmd-report.html
-# Properties for the PMD violations aggregator
+# Properties for the PMD violations aggregator
maven.dashboard.aggregator.pmdviolations.script = ${maven.dashboard.aggregators.dir}/pmdviolations.jelly
maven.dashboard.aggregator.pmdviolations.artifact = ${maven.build.dir}/pmd-raw-report.xml
maven.dashboard.aggregator.pmdviolations.label = PMD Violations
@@ -230,7 +224,7 @@
maven.dashboard.aggregator.pmdviolations.description = Number of PMD violations
maven.dashboard.aggregator.pmdviolations.report = pmd-report.html
-# Properties for the Simian duplicate lines aggregator
+# Properties for the Simian duplicate lines aggregator
maven.dashboard.aggregator.simiantdl.script = ${maven.dashboard.aggregators.dir}/simiantdl.jelly
maven.dashboard.aggregator.simiantdl.artifact = ${maven.build.dir}/generated-xdocs/simian-report.xml
maven.dashboard.aggregator.simiantdl.label = Simian TDL
@@ -238,7 +232,7 @@
maven.dashboard.aggregator.simiantdl.description = Simian Total Duplicate Lines
maven.dashboard.aggregator.simiantdl.report = simian-report.html
-# Properties for the JCoverage covered lines percent aggregator
+# Properties for the JCoverage covered lines percent aggregator
maven.dashboard.aggregator.jcoveragelipc.script = ${maven.dashboard.aggregators.dir}/jcoveragelipc.jelly
maven.dashboard.aggregator.jcoveragelipc.artifact = ${maven.build.dir}/jcoverage/coverage.xml
maven.dashboard.aggregator.jcoveragelipc.label = JCoverage %lines
@@ -246,7 +240,7 @@
maven.dashboard.aggregator.jcoveragelipc.description = JCoverage covered lines percentile
maven.dashboard.aggregator.jcoveragelipc.report = jcoverage/index.html
-# Properties for the JCoverage total lines aggregator
+# Properties for the JCoverage total lines aggregator
maven.dashboard.aggregator.jcoverageloc.script = ${maven.dashboard.aggregators.dir}/jcoverageloc.jelly
maven.dashboard.aggregator.jcoverageloc.artifact = ${maven.build.dir}/jcoverage/coverage.xml
maven.dashboard.aggregator.jcoverageloc.label = JCoverage LOC
@@ -254,7 +248,7 @@
maven.dashboard.aggregator.jcoverageloc.description = JCoverage total lines of code
maven.dashboard.aggregator.jcoverageloc.report = jcoverage/index.html
-# Properties for the Cobertura covered lines percent aggregator
+# Properties for the Cobertura covered lines percent aggregator
maven.dashboard.aggregator.coberturalipc.script = ${maven.dashboard.aggregators.dir}/coberturalipc.jelly
maven.dashboard.aggregator.coberturalipc.artifact = ${maven.docs.dest}/cobertura/coverage.xml
maven.dashboard.aggregator.coberturalipc.label = Cobertura %lines
@@ -262,7 +256,7 @@
maven.dashboard.aggregator.coberturalipc.description = Cobertura covered lines percentile
maven.dashboard.aggregator.coberturalipc.report = cobertura/index.html
-# Properties for the Cobertura total lines aggregator
+# Properties for the Cobertura total lines aggregator
maven.dashboard.aggregator.coberturaloc.script = ${maven.dashboard.aggregators.dir}/coberturaloc.jelly
maven.dashboard.aggregator.coberturaloc.artifact = ${maven.docs.dest}/cobertura/coverage.xml
maven.dashboard.aggregator.coberturaloc.label = Cobertura LOC
@@ -270,7 +264,7 @@
maven.dashboard.aggregator.coberturaloc.description = Cobertura total lines of code
maven.dashboard.aggregator.coberturaloc.report = cobertura/index.html
-# Properties for the FindBugs file violations aggregator
+# Properties for the FindBugs file violations aggregator
maven.dashboard.aggregator.fbfiles.script = ${maven.dashboard.aggregators.dir}/fbfiles.jelly
maven.dashboard.aggregator.fbfiles.artifact = ${maven.build.dir}/findbugs-raw-report.xml
maven.dashboard.aggregator.fbfiles.label = FindBugs Files with Violations
@@ -278,7 +272,7 @@
maven.dashboard.aggregator.fbfiles.description = Number of files with FindBugs violations
maven.dashboard.aggregator.fbfiles.report = findbugs-report.html
-# Properties for the FindBugs violations aggregator
+# Properties for the FindBugs violations aggregator
maven.dashboard.aggregator.fbviolations.script = ${maven.dashboard.aggregators.dir}/fbviolations.jelly
maven.dashboard.aggregator.fbviolations.artifact = ${maven.build.dir}/findbugs-raw-report.xml
maven.dashboard.aggregator.fbviolations.label = FindBugs Violations
@@ -289,7 +283,7 @@
# Classes Tasks aggregator
maven.dashboard.aggregator.tasklistclass.script = ${maven.dashboard.aggregators.dir}/task-list-classes.jelly
maven.dashboard.aggregator.tasklistclass.artifact = ${maven.build.dir}/generated-xdocs/task-list.xml
-maven.dashboard.aggregator.tasklistclass.label = Classes Tasks
+maven.dashboard.aggregator.tasklistclass.label = Classes Tasks
maven.dashboard.aggregator.tasklistclass.goal = maven-tasklist-plugin:report
maven.dashboard.aggregator.tasklistclass.description = Total number of classes with task definition (@todo tag).
maven.dashboard.aggregator.tasklistclass.report = task-list.html
@@ -297,7 +291,7 @@
# Methods Tasks aggregator
maven.dashboard.aggregator.tasklistmethod.script = ${maven.dashboard.aggregators.dir}/task-list-methods.jelly
maven.dashboard.aggregator.tasklistmethod.artifact = ${maven.build.dir}/generated-xdocs/task-list.xml
-maven.dashboard.aggregator.tasklistmethod.label = Methods Tasks
+maven.dashboard.aggregator.tasklistmethod.label = Methods Tasks
maven.dashboard.aggregator.tasklistmethod.goal = maven-tasklist-plugin:report
maven.dashboard.aggregator.tasklistmethod.description = Total number of methods with task definition (@todo tag).
maven.dashboard.aggregator.tasklistmethod.report = task-list.html
@@ -305,7 +299,7 @@
# All Tasks aggregator
maven.dashboard.aggregator.tasklist.script = ${maven.dashboard.aggregators.dir}/task-list-all.jelly
maven.dashboard.aggregator.tasklist.artifact = ${maven.build.dir}/generated-xdocs/task-list.xml
-maven.dashboard.aggregator.tasklist.label = All Tasks
+maven.dashboard.aggregator.tasklist.label = All Tasks
maven.dashboard.aggregator.tasklist.goal = maven-tasklist-plugin:report
maven.dashboard.aggregator.tasklist.description = Total number of task definition (@todo tag).
maven.dashboard.aggregator.tasklist.report = task-list.html
Deleted: trunk/mud4j/src/site/site.xml
===================================================================
--- trunk/mud4j/src/site/site.xml 2008-03-12 21:50:26 UTC (rev 163)
+++ trunk/mud4j/src/site/site.xml 2009-04-30 23:43:58 UTC (rev 164)
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
- <bannerRight>
- <name>SourceForge</name>
- <src>
- http://sflogo.sourceforge.net/sflogo.php?group_id=184313&type=2</src>
- <href>http://sourceforge.net</href>
- </bannerRight>
- <body>
- <links>
- <item name="Repository"
- href="http://mud4j.svn.sourceforge.net/viewvc/mud4j/trunk/"/>
- <item name="Dashboard" href="dashboard-report.html"/>
- </links>
- <menu name="Projects">
- <item name="mud4j Overview" href="http://mud4j.sf.net/index.html"/>
- <item name="mud4j-core"
- href="http://mud4j.sf.net/mud4j-core/index.html"/>
- <item name="mud4j-telnet"
- href="http://mud4j.sf.net/mud4j-telnet/index.html"/>
- <item name="mud4j-web"
- href="http://mud4j.sf.net/mud4j-web/index.html"/>
- </menu>
-
- <!-- Documentation for mud4j project, cannot use common because this
- is not a real component -->
- <menu name="Developer Docs">
- <item name="Design Considerations" href="design-considerations.html"/>
- <item name="Ideas" href="ideas.html"/>
- </menu>
-
- <menu name="Project Info">
- <item name="Mailing Lists" href="/mail-lists.html"/>
- <item name="Project Team" href="/team-list.html"/>
- <item name="Dependencies" href="/dependencies.html"/>
- <item name="Source Repository" href="/source-repository.html"/>
- <item name="Issue Tracking" href="/issue-tracking.html"/>
- </menu>
-
- </body>
-</site>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mpu...@us...> - 2008-03-12 21:50:27
|
Revision: 163
http://mud4j.svn.sourceforge.net/mud4j/?rev=163&view=rev
Author: mpurland
Date: 2008-03-12 14:50:26 -0700 (Wed, 12 Mar 2008)
Log Message:
-----------
Update pom.xml for build.
Modified Paths:
--------------
trunk/mud4j-core/pom.xml
Modified: trunk/mud4j-core/pom.xml
===================================================================
--- trunk/mud4j-core/pom.xml 2008-03-12 21:50:23 UTC (rev 162)
+++ trunk/mud4j-core/pom.xml 2008-03-12 21:50:26 UTC (rev 163)
@@ -16,7 +16,8 @@
<groupId>net.sf.mud4j</groupId>
<artifactId>mud4j-core</artifactId>
<version>1.0-SNAPSHOT</version>
-
+ <packaging>jar</packaging>
+
<!-- Dependencies -->
<dependencies>
<dependency>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mpu...@us...> - 2008-03-12 21:50:26
|
Revision: 162
http://mud4j.svn.sourceforge.net/mud4j/?rev=162&view=rev
Author: mpurland
Date: 2008-03-12 14:50:23 -0700 (Wed, 12 Mar 2008)
Log Message:
-----------
Update pom.xml for build.
Modified Paths:
--------------
trunk/mud4j-telnet/pom.xml
Modified: trunk/mud4j-telnet/pom.xml
===================================================================
--- trunk/mud4j-telnet/pom.xml 2008-03-12 21:50:20 UTC (rev 161)
+++ trunk/mud4j-telnet/pom.xml 2008-03-12 21:50:23 UTC (rev 162)
@@ -18,6 +18,7 @@
<groupId>net.sf.mud4j</groupId>
<artifactId>mud4j-telnet</artifactId>
<version>1.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
<!-- Dependencies -->
<dependencies>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mpu...@us...> - 2008-03-12 21:50:21
|
Revision: 161
http://mud4j.svn.sourceforge.net/mud4j/?rev=161&view=rev
Author: mpurland
Date: 2008-03-12 14:50:20 -0700 (Wed, 12 Mar 2008)
Log Message:
-----------
Update pom.xml for build.
Modified Paths:
--------------
trunk/mud4j/pom.xml
Modified: trunk/mud4j/pom.xml
===================================================================
--- trunk/mud4j/pom.xml 2008-03-12 21:50:16 UTC (rev 160)
+++ trunk/mud4j/pom.xml 2008-03-12 21:50:20 UTC (rev 161)
@@ -1,236 +1,271 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <packaging>pom</packaging>
- <name>mud4j</name>
- <groupId>net.sf.mud4j</groupId>
- <artifactId>mud4j-master</artifactId>
- <version>1.0-SNAPSHOT</version>
-
- <url>http://mud4j.sf.net/</url>
- <inceptionYear>2006</inceptionYear>
-
- <repositories>
- <repository>
- <id>Codehaus Snapshots</id>
- <url>http://snapshots.repository.codehaus.org/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>Codehaus Snapshots</id>
- <url>http://snapshots.repository.codehaus.org/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </pluginRepository>
- </pluginRepositories>
-
- <licenses>
- <license>
- <name>Apache 2</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- <comments>A business-friendly OSS license</comments>
- </license>
- </licenses>
-
- <organization>
- <name>mud4j</name>
- <url>http://sourceforge.net/projects/mud4j</url>
- </organization>
-
- <description> A framework for MUD and game servers to sedparate logic into domain tiers.
- This will separate business logic and features of creating a game server and also let
- dependent projects focus on game domain logic and content.
- </description>
-
- <distributionManagement>
- <site>
- <id>mud4j website</id>
- <name>mud4j Website</name>
- <url>
- scp://shell.sourceforge.net/home/groups/m/mu/mud4j/htdocs/</url>
- </site>
- </distributionManagement>
-
- <scm>
- <connection>
- scm:svn:https://svn.sourceforge.net/svnroot/mud4j</connection>
- <developerConnection>
- scm:svn:https://svn.sourceforge.net/svnroot/mud4j</developerConnection>
- <tag>HEAD</tag>
- <url>http://mud4j.svn.sourceforge.net/viewvc/mud4j/trunk/</url>
- </scm>
-
- <!-- any mailing lists for the project -->
- <mailingLists>
- <mailingList>
- <name>User List</name>
- <subscribe>
- ${pom.artifactId}-use...@li...</subscribe>
- <unsubscribe>
- ${pom.artifactId}-use...@li...</unsubscribe>
-
- <post>${pom.artifactId}-us...@li...</post>
- </mailingList>
- <mailingList>
- <name>Developer List</name>
- <subscribe>
- ${pom.artifactId}-dev...@li...</subscribe>
- <unsubscribe>
- ${pom.artifactId}-dev...@li...</unsubscribe>
-
- <post>${pom.artifactId}-dev...@li...</post>
- <archive>
- http://sourceforge.net/mailarchive/forum.php?forum_id=51227</archive>
- </mailingList>
- <mailingList>
- <name>Commit List</name>
- <subscribe>
- ${pom.artifactId}-com...@li...</subscribe>
- <unsubscribe>
- ${pom.artifactId}-com...@li...</unsubscribe>
- </mailingList>
- <mailingList>
- <name>Tracker List</name>
- <subscribe>
- ${pom.artifactId}-tra...@li...</subscribe>
- <unsubscribe>
- ${pom.artifactId}-tra...@li...</unsubscribe>
- </mailingList>
- </mailingLists>
-
- <!-- Developers/Contributors for this project -->
- <developers>
- <developer>
- <name>Matthew Purland</name>
- <id>mpurland</id>
- <roles>
- <role>Founder</role>
- <role>Developer</role>
- </roles>
- <timezone>-6</timezone>
- <email>mpu...@us...</email>
- </developer>
- </developers>
- <contributors/>
-
- <modules>
- <module>../mud4j-core</module>
- <module>../mud4j-telnet</module>
- <module>../mud4j-web</module>
- </modules>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changes-plugin</artifactId>
- <reportSets>
- <reportSet>
- <reports>
- <report>changes-report</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- </plugin>
- <!-- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changelog-plugin</artifactId>
- </plugin> -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
-
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- </plugin>
- <!-- Last report -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>dashboard-maven-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <configuration>
- <downloadSources>true</downloadSources>
- <downloadJavadocs>true</downloadJavadocs>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-plugin-plugin</artifactId>
- <configuration>
- <goalPrefix>dashboard-report</goalPrefix>
- </configuration>
- </plugin>
- </plugins>
- <defaultGoal>jar</defaultGoal>
- <sourceDirectory>src/java</sourceDirectory>
- <testSourceDirectory>src/test/unit</testSourceDirectory>
- <resources>
- <resource>
- <directory>src/resources</directory>
- <filtering>false</filtering>
- </resource>
- <resource>
- <directory>${basedir}/src/resources/logging</directory>
- <includes>
- <include>log4j.properties</include>
- </includes>
- <filtering>false</filtering>
- </resource>
- </resources>
- </build>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>pom</packaging>
+ <name>mud4j</name>
+ <groupId>net.sf.mud4j</groupId>
+ <artifactId>mud4j-master</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <url>http://mud4j.sf.net/</url>
+ <inceptionYear>2006</inceptionYear>
+
+ <repositories>
+ <repository>
+ <id>Codehaus Snapshots</id>
+ <url>http://snapshots.repository.codehaus.org/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>Codehaus Snapshots</id>
+ <url>http://snapshots.repository.codehaus.org/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </pluginRepository>
+ </pluginRepositories>
+
+ <licenses>
+ <license>
+ <name>Apache 2</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ <comments>A business-friendly OSS license</comments>
+ </license>
+ </licenses>
+
+ <organization>
+ <name>mud4j</name>
+ <url>http://sourceforge.net/projects/mud4j</url>
+ </organization>
+
+ <description>
+ A framework for MUD and game servers to sedparate logic into
+ domain tiers. This will separate business logic and features of
+ creating a game server and also let dependent projects focus on
+ game domain logic and content.
+ </description>
+
+ <distributionManagement>
+ <site>
+ <id>mud4j website</id>
+ <name>mud4j Website</name>
+ <url>
+ scp://shell.sourceforge.net/home/groups/m/mu/mud4j/htdocs/
+ </url>
+ </site>
+ </distributionManagement>
+
+ <scm>
+ <connection>
+ scm:svn:https://svn.sourceforge.net/svnroot/mud4j
+ </connection>
+ <developerConnection>
+ scm:svn:https://svn.sourceforge.net/svnroot/mud4j
+ </developerConnection>
+ <tag>HEAD</tag>
+ <url>http://mud4j.svn.sourceforge.net/viewvc/mud4j/trunk/</url>
+ </scm>
+
+ <!-- any mailing lists for the project -->
+ <mailingLists>
+ <mailingList>
+ <name>User List</name>
+ <subscribe>
+ ${pom.artifactId}-use...@li...
+ </subscribe>
+ <unsubscribe>
+ ${pom.artifactId}-use...@li...
+ </unsubscribe>
+
+ <post>${pom.artifactId}-us...@li...</post>
+ </mailingList>
+ <mailingList>
+ <name>Developer List</name>
+ <subscribe>
+ ${pom.artifactId}-dev...@li...
+ </subscribe>
+ <unsubscribe>
+ ${pom.artifactId}-dev...@li...
+ </unsubscribe>
+
+ <post>
+ ${pom.artifactId}-dev...@li...
+ </post>
+ <archive>
+ http://sourceforge.net/mailarchive/forum.php?forum_id=51227
+ </archive>
+ </mailingList>
+ <mailingList>
+ <name>Commit List</name>
+ <subscribe>
+ ${pom.artifactId}-com...@li...
+ </subscribe>
+ <unsubscribe>
+ ${pom.artifactId}-com...@li...
+ </unsubscribe>
+ </mailingList>
+ <mailingList>
+ <name>Tracker List</name>
+ <subscribe>
+ ${pom.artifactId}-tra...@li...
+ </subscribe>
+ <unsubscribe>
+ ${pom.artifactId}-tra...@li...
+ </unsubscribe>
+ </mailingList>
+ </mailingLists>
+
+ <!-- Developers/Contributors for this project -->
+ <developers>
+ <developer>
+ <name>Matthew Purland</name>
+ <id>mpurland</id>
+ <roles>
+ <role>Founder</role>
+ <role>Developer</role>
+ </roles>
+ <timezone>-6</timezone>
+ <email>mpu...@us...</email>
+ </developer>
+ </developers>
+ <contributors />
+
+ <modules>
+ <module>../mud4j-core</module>
+ <module>../mud4j-telnet</module>
+ <module>../mud4j-web</module>
+ </modules>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>
+ maven-project-info-reports-plugin
+ </artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changes-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>changes-report</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ <!-- <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changelog-plugin</artifactId>
+ </plugin> -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ </plugin>
+ <!-- Last report -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dashboard-maven-plugin</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ <downloadJavadocs>true</downloadJavadocs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <configuration>
+ <goalPrefix>dashboard-report</goalPrefix>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <includes>
+ <include>src/test/**/*Test.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ <downloadJavadocs>true</downloadJavadocs>
+ </configuration>
+ </plugin>
+ </plugins>
+ <defaultGoal>jar</defaultGoal>
+ <sourceDirectory>src/java</sourceDirectory>
+ <testSourceDirectory>src/test/unit</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>src/resources</directory>
+ <filtering>false</filtering>
+ </resource>
+ <resource>
+ <directory>${basedir}/src/resources/logging</directory>
+ <includes>
+ <include>log4j.properties</include>
+ </includes>
+ <filtering>false</filtering>
+ </resource>
+ </resources>
+ </build>
</project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mpu...@us...> - 2008-03-12 21:50:19
|
Revision: 160
http://mud4j.svn.sourceforge.net/mud4j/?rev=160&view=rev
Author: mpurland
Date: 2008-03-12 14:50:16 -0700 (Wed, 12 Mar 2008)
Log Message:
-----------
Update pom.xml for build.
Modified Paths:
--------------
trunk/mud4j-web/pom.xml
Modified: trunk/mud4j-web/pom.xml
===================================================================
--- trunk/mud4j-web/pom.xml 2007-11-01 00:01:48 UTC (rev 159)
+++ trunk/mud4j-web/pom.xml 2008-03-12 21:50:16 UTC (rev 160)
@@ -17,6 +17,7 @@
<groupId>net.sf.mud4j</groupId>
<artifactId>mud4j-web</artifactId>
<version>1.0-SNAPSHOT</version>
+ <packaging>war</packaging>
<!-- Dependencies -->
<dependencies>
@@ -113,24 +114,24 @@
<version>1.6</version>
</dependency>
</dependencies>
-
- <build>
- <defaultGoal>jar</defaultGoal>
- <sourceDirectory>src/java</sourceDirectory>
- <testSourceDirectory>src/test</testSourceDirectory>
- <resources>
- <resource>
- <directory>src/resources</directory>
- <filtering>false</filtering>
- </resource>
- <resource>
- <directory>${basedir}/src/resources/logging</directory>
- <includes>
- <include>log4j.properties</include>
- </includes>
- <filtering>false</filtering>
- </resource>
- </resources>
+
+ <build>
+ <defaultGoal>war</defaultGoal>
+ <sourceDirectory>src/java</sourceDirectory>
+ <testSourceDirectory>src/test/unit</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>src/resources</directory>
+ <filtering>false</filtering>
+ </resource>
+ <resource>
+ <directory>${basedir}/src/resources/logging</directory>
+ <includes>
+ <include>log4j.properties</include>
+ </includes>
+ <filtering>false</filtering>
+ </resource>
+ </resources>
</build>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mpu...@us...> - 2007-11-01 00:01:54
|
Revision: 159
http://mud4j.svn.sourceforge.net/mud4j/?rev=159&view=rev
Author: mpurland
Date: 2007-10-31 17:01:48 -0700 (Wed, 31 Oct 2007)
Log Message:
-----------
Add Startup.
Add link/one-way and two-way location links.
Added Paths:
-----------
trunk/mud4j-core/src/java/net/sf/mud4j/startup/Startup.java
trunk/mud4j-core/src/java/net/sf/mud4j/world/link/LocationLink.java
trunk/mud4j-core/src/java/net/sf/mud4j/world/link/LocationLinkManager.java
trunk/mud4j-core/src/java/net/sf/mud4j/world/link/OneWayLocationLink.java
trunk/mud4j-core/src/java/net/sf/mud4j/world/link/TileLocationLink.java
trunk/mud4j-core/src/java/net/sf/mud4j/world/link/TwoWayLocationLink.java
Added: trunk/mud4j-core/src/java/net/sf/mud4j/startup/Startup.java
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/startup/Startup.java (rev 0)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/startup/Startup.java 2007-11-01 00:01:48 UTC (rev 159)
@@ -0,0 +1,19 @@
+package net.sf.mud4j.startup;
+
+import net.sf.mud4j.scheduling.QuartzSchedulingService;
+import net.sf.mud4j.util.SpringHelper;
+
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+public class Startup {
+ public static void main(String[] args) {
+ final boolean saveData = true;
+ ClassPathXmlApplicationContext appContext = SpringHelper.getClassPathXmlApplicationContext(saveData);
+ QuartzSchedulingService schedulingService = (QuartzSchedulingService) appContext.getBean("schedulingService");
+
+// String[] groupNames = schedulingService.getGroupNames();
+// for (String groupName : groupNames) {
+// System.out.println(groupName);
+// }
+ }
+}
Property changes on: trunk/mud4j-core/src/java/net/sf/mud4j/startup/Startup.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/mud4j-core/src/java/net/sf/mud4j/world/link/LocationLink.java
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/world/link/LocationLink.java (rev 0)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/world/link/LocationLink.java 2007-11-01 00:01:48 UTC (rev 159)
@@ -0,0 +1,29 @@
+package net.sf.mud4j.world.link;
+
+import java.util.Set;
+
+import net.sf.mud4j.world.Location;
+import net.sf.mud4j.world.MoveableException;
+import net.sf.mud4j.world.Placeable;
+
+/**
+ * Link between a set of {@link Location} objects.
+ *
+ * @author Matthew Purland
+ */
+public interface LocationLink<L extends Location> {
+ /**
+ * Get set of locations that are linked.
+ */
+ Set<L> getLocations();
+
+ /**
+ * Move a placeable using the link to the appropriate location.
+ *
+ * @param placeable
+ * The placeable
+ * @throws MoveableException
+ * when the given placeable is not in the source location.
+ */
+ void move(Placeable placeable) throws MoveableException;
+}
Property changes on: trunk/mud4j-core/src/java/net/sf/mud4j/world/link/LocationLink.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/mud4j-core/src/java/net/sf/mud4j/world/link/LocationLinkManager.java
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/world/link/LocationLinkManager.java (rev 0)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/world/link/LocationLinkManager.java 2007-11-01 00:01:48 UTC (rev 159)
@@ -0,0 +1,20 @@
+package net.sf.mud4j.world.link;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import net.sf.mud4j.world.Location;
+
+public class LocationLinkManager {
+ Map<Location, LocationLink> locationToLocationLinkMap = new HashMap<Location, LocationLink>();
+
+ public void addLink(Location location, LocationLink locationLink) {
+ locationToLocationLinkMap.put(location, locationLink);
+ }
+
+ public void removeLink(LocationLink locationLink) {
+ locationToLocationLinkMap.remove(locationLink);
+ }
+
+ //public Set<LocationLink>
+}
Property changes on: trunk/mud4j-core/src/java/net/sf/mud4j/world/link/LocationLinkManager.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/mud4j-core/src/java/net/sf/mud4j/world/link/OneWayLocationLink.java
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/world/link/OneWayLocationLink.java (rev 0)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/world/link/OneWayLocationLink.java 2007-11-01 00:01:48 UTC (rev 159)
@@ -0,0 +1,15 @@
+package net.sf.mud4j.world.link;
+
+import net.sf.mud4j.world.Location;
+
+/**
+ * One-way link between a source and destination location.
+ *
+ * @author Matthew Purland
+ *
+ * @param <T>
+ */
+public interface OneWayLocationLink <T extends Location> extends LocationLink<T> {
+
+
+}
Property changes on: trunk/mud4j-core/src/java/net/sf/mud4j/world/link/OneWayLocationLink.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/mud4j-core/src/java/net/sf/mud4j/world/link/TileLocationLink.java
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/world/link/TileLocationLink.java (rev 0)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/world/link/TileLocationLink.java 2007-11-01 00:01:48 UTC (rev 159)
@@ -0,0 +1,74 @@
+package net.sf.mud4j.world.link;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import net.sf.mud4j.world.Direction;
+import net.sf.mud4j.world.MoveableException;
+import net.sf.mud4j.world.Placeable;
+import net.sf.mud4j.world.TileLocation;
+
+public class TileLocationLink implements TwoWayLocationLink<TileLocation> {
+
+ private TileLocation sourceLocation;
+ private TileLocation destLocation;
+ private Direction directionFromSourceLocation;
+ private Set<TileLocation> locationSet;
+
+ public TileLocationLink(TileLocation sourceLocation,
+ TileLocation destLocation, Direction directionFromSourceLocation) {
+ this.sourceLocation = sourceLocation;
+ this.destLocation = destLocation;
+ this.directionFromSourceLocation = directionFromSourceLocation;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public Set<TileLocation> getLocations() {
+ if (locationSet == null) {
+ locationSet = new HashSet<TileLocation>();
+ locationSet.add(sourceLocation);
+ locationSet.add(destLocation);
+ }
+ return locationSet;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public TileLocation getDestination() {
+ return destLocation;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public TileLocation getSource() {
+ return sourceLocation;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void move(Placeable placeable) throws MoveableException {
+ boolean inSourceLocation = placeable.getCurrentLocation() != null
+ && placeable.getCurrentLocation().equals(sourceLocation);
+ boolean inDestLocation = placeable.getCurrentLocation() != null
+ && placeable.getCurrentLocation().equals(destLocation);
+
+ if (inSourceLocation) {
+ placeable.place(destLocation);
+ } else if (inDestLocation) {
+ placeable.place(sourceLocation);
+ } else {
+ throw new MoveableException("Placeable " + placeable
+ + " is not in source or destination location in link.");
+ }
+ }
+
+}
Property changes on: trunk/mud4j-core/src/java/net/sf/mud4j/world/link/TileLocationLink.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/mud4j-core/src/java/net/sf/mud4j/world/link/TwoWayLocationLink.java
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/world/link/TwoWayLocationLink.java (rev 0)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/world/link/TwoWayLocationLink.java 2007-11-01 00:01:48 UTC (rev 159)
@@ -0,0 +1,17 @@
+package net.sf.mud4j.world.link;
+
+import net.sf.mud4j.world.Location;
+
+/**
+ * Two-way link between a source and destination location. The term of source
+ * and destination is simply used to represent two locations.
+ *
+ * @author Matthew Purland
+ *
+ * @param <T>
+ */
+public interface TwoWayLocationLink<T extends Location> extends LocationLink<T> {
+ T getSource();
+
+ T getDestination();
+}
Property changes on: trunk/mud4j-core/src/java/net/sf/mud4j/world/link/TwoWayLocationLink.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mpu...@us...> - 2007-11-01 00:01:02
|
Revision: 158
http://mud4j.svn.sourceforge.net/mud4j/?rev=158&view=rev
Author: mpurland
Date: 2007-10-31 17:00:59 -0700 (Wed, 31 Oct 2007)
Log Message:
-----------
Add scheduling service. Add SpringHelper.
Rework tile/movement and link system for tiles.
Add DaoTest.
Modified Paths:
--------------
trunk/mud4j-core/src/java/net/sf/mud4j/scheduling/QuartzSchedulingService.java
trunk/mud4j-core/src/java/net/sf/mud4j/scheduling/SchedulingService.java
trunk/mud4j-core/src/java/net/sf/mud4j/world/Direction.java
trunk/mud4j-core/src/java/net/sf/mud4j/world/Room.java
trunk/mud4j-core/src/java/net/sf/mud4j/world/TileLocation.java
trunk/mud4j-core/src/resources/spring-config.xml
trunk/mud4j-core/src/test/unit/net/sf/mud4j/dao/DaoTest.java
trunk/mud4j-core/src/test/unit/net/sf/mud4j/test/Mud4jSpringTestBase.java
Added Paths:
-----------
trunk/mud4j-core/src/java/net/sf/mud4j/skill/
trunk/mud4j-core/src/java/net/sf/mud4j/startup/
trunk/mud4j-core/src/java/net/sf/mud4j/util/SpringHelper.java
trunk/mud4j-core/src/java/net/sf/mud4j/world/MoveableException.java
trunk/mud4j-core/src/java/net/sf/mud4j/world/link/
trunk/mud4j-core/src/resources/hsqldb/
trunk/mud4j-core/src/test/unit/net/sf/mud4j/world/
trunk/mud4j-core/src/test/unit/net/sf/mud4j/world/DirectionTest.java
trunk/mud4j-core/src/test/unit/net/sf/mud4j/world/RoomTest.java
trunk/mud4j-core/src/test/unit/net/sf/mud4j/world/TileLocationTest.java
Modified: trunk/mud4j-core/src/java/net/sf/mud4j/scheduling/QuartzSchedulingService.java
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/scheduling/QuartzSchedulingService.java 2007-10-14 21:55:55 UTC (rev 157)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/scheduling/QuartzSchedulingService.java 2007-11-01 00:00:59 UTC (rev 158)
@@ -1,6 +1,7 @@
package net.sf.mud4j.scheduling;
import org.quartz.Scheduler;
+import org.quartz.SchedulerException;
public class QuartzSchedulingService implements SchedulingService {
private Scheduler scheduler;
@@ -9,4 +10,17 @@
Scheduler scheduler) {
this.scheduler = scheduler;
}
+
+ public String[] getGroupNames() throws SchedulerException {
+ return scheduler.getJobGroupNames();
+ }
+
+ public String[] getJobNames(String groupName) throws SchedulerException {
+ return scheduler.getJobNames(groupName);
+ //scheduler.getJobDetail(jobName, jobGroup)
+ }
+
+ public void addJob(String jobName, String groupName) {
+ //scheduler.addJob(jobDetail, replace)
+ }
}
Modified: trunk/mud4j-core/src/java/net/sf/mud4j/scheduling/SchedulingService.java
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/scheduling/SchedulingService.java 2007-10-14 21:55:55 UTC (rev 157)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/scheduling/SchedulingService.java 2007-11-01 00:00:59 UTC (rev 158)
@@ -1,5 +1,7 @@
package net.sf.mud4j.scheduling;
public interface SchedulingService {
-
+ public static final String DEFAULT_JOB_GROUP = "mud4j";
+
+ void addJob(String jobName, String groupName);
}
\ No newline at end of file
Added: trunk/mud4j-core/src/java/net/sf/mud4j/util/SpringHelper.java
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/util/SpringHelper.java (rev 0)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/util/SpringHelper.java 2007-11-01 00:00:59 UTC (rev 158)
@@ -0,0 +1,56 @@
+package net.sf.mud4j.util;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+import org.apache.commons.dbcp.BasicDataSource;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationEvent;
+import org.springframework.context.ApplicationListener;
+import org.springframework.context.event.ContextClosedEvent;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+public class SpringHelper {
+
+ public static ClassPathXmlApplicationContext getClassPathXmlApplicationContext(boolean saveData) {
+ ClassPathXmlApplicationContext appContext = new ClassPathXmlApplicationContext(
+ new String[] { "spring-config.xml" });
+
+ appContext.registerShutdownHook();
+
+ if (saveData) {
+ // Add an application listener for when it is closed
+ appContext.addApplicationListener(new ApplicationListener() {
+ @Override
+ public void onApplicationEvent(ApplicationEvent event) {
+ if (event instanceof ContextClosedEvent) {
+ ContextClosedEvent contextClosedEvent = (ContextClosedEvent) event;
+ ApplicationContext appContext = contextClosedEvent.getApplicationContext();
+
+ // Tell HSQLDB to shutdown and save data
+ BasicDataSource basicDataSource = (BasicDataSource) appContext.getBean("hsqlDataSource");
+ Connection connection;
+ try {
+ connection = basicDataSource.getConnection();
+
+ String sql = "SHUTDOWN";
+ Statement stmt = connection.createStatement();
+ stmt.executeUpdate(sql);
+ stmt.close();
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+ }
+
+ });
+
+ // Refresh and add the application listener
+ appContext.refresh();
+ }
+
+ return appContext;
+ }
+}
Property changes on: trunk/mud4j-core/src/java/net/sf/mud4j/util/SpringHelper.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/mud4j-core/src/java/net/sf/mud4j/world/Direction.java
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/world/Direction.java 2007-10-14 21:55:55 UTC (rev 157)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/world/Direction.java 2007-11-01 00:00:59 UTC (rev 158)
@@ -20,89 +20,96 @@
* Direction to define different directions for dynamic direction management to
* add west, east, north, south, etc...
*
+ * Provides the link between a pair of {@link Location}.
+ *
* @author Matthew Purland
*/
-public class Direction {
+public enum Direction {
- public enum DirectionName {
+// public enum DirectionName {
NORTH("north"),
EAST("east"),
WEST("west"),
- SOUTH("south");
-
+ SOUTH("south"),
+ NORTHEAST("northeast"),
+ NORTHWEST("northwest"),
+ SOUTHWEST("southwest"),
+ SOUTHEAST("southeast");
+//
private String directionName;
- DirectionName(String directionName) {
+ Direction(String directionName) {
this.directionName = directionName;
}
public String getDirectionName() {
return directionName;
}
- }
-
- private DirectionName directionName;
-
- /**
- * Direction is from source to target location. Example. If direction is
- * east then Source (east to) --> Target
- */
- private TileLocation sourceLocation;
- private TileLocation targetLocation;
-
- /**
- * Creates a direction with a name such as "north" or "south".
- *
- * @param directionName Name of the direction.
- * @param sourceLocation Source of the location to the target
- * @param targetLocation Target of the location from the source
- */
- public Direction(DirectionName directionName, TileLocation sourceLocation,
- TileLocation targetLocation) {
- this.directionName = directionName;
- this.sourceLocation = sourceLocation;
- this.targetLocation = targetLocation;
- }
-
- /**
- * Get name of direction.
- */
- public DirectionName getDirectionName() {
- return directionName;
- }
-
- /**
- * Get the source location.
- *
- * @return the source location.
- */
- public TileLocation getSourceLocation() {
- return sourceLocation;
- }
-
- /**
- * Get the target location.
- *
- * @return the target location.
- */
- public TileLocation getTargetLocation() {
- return targetLocation;
- }
-
- /**
- * Move the given placeable to the target location of the direction.
- *
- * @param placeable Placeable to place within the target location.
- * @throws IllegalArgumentException when the given placeable is not in the
- * source location.
- */
- public void move(Placeable placeable) throws IllegalArgumentException {
- if (!placeable.getCurrentLocation().equals(getSourceLocation())) {
- throw new IllegalArgumentException("Could not place placeable ("
- + placeable
- + ") because it is not currently in the source location.");
- }
-
- placeable.place(targetLocation);
- }
+// }
+//
+// private DirectionName directionName;
+//
+// /**
+// * Direction is from source to target location. Example. If direction is
+// * east then Source (east to) --> Target
+// */
+// private TileLocation sourceLocation;
+// private TileLocation targetLocation;
+//
+// /**
+// * Creates a direction with a name such as "north" or "south".
+// *
+// * @param sourceLocation Source of the location to the target
+// * @param targetLocation Target of the location from the source
+// */
+// public Direction(DirectionName directionName, TileLocation sourceLocation,
+// TileLocation targetLocation) {
+// this.directionName = directionName;
+// this.sourceLocation = sourceLocation;
+// this.targetLocation = targetLocation;
+// }
+//
+// /**
+// * Get name of direction.
+// */
+// public DirectionName getDirectionName() {
+// return directionName;
+// }
+//
+// /**
+// * Get the source location.
+// *
+// * @return the source location.
+// */
+// public TileLocation getSourceLocation() {
+// return sourceLocation;
+// }
+//
+// /**
+// * Get the target location.
+// *
+// * @return the target location.
+// */
+// public TileLocation getTargetLocation() {
+// return targetLocation;
+// }
+//
+// /**
+// * Move the given placeable to the target location of the direction.
+// *
+// * @param placeable Placeable to place within the target location.
+// * @throws MoveableException when the given placeable is not in the
+// * source location.
+// */
+// public void move(Placeable placeable) throws MoveableException {
+// Location placeableCurrentLocation = placeable.getCurrentLocation();
+//
+// if (placeableCurrentLocation == null || !placeableCurrentLocation.equals(getSourceLocation())) {
+// throw new MoveableException("Could not place placeable ("
+// + placeable
+// + ") because it is not currently in the source location.");
+// }
+//
+// placeable.place(targetLocation);
+// }
}
Added: trunk/mud4j-core/src/java/net/sf/mud4j/world/MoveableException.java
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/world/MoveableException.java (rev 0)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/world/MoveableException.java 2007-11-01 00:00:59 UTC (rev 158)
@@ -0,0 +1,7 @@
+package net.sf.mud4j.world;
+
+public class MoveableException extends Exception {
+ public MoveableException(String mesg) {
+ super(mesg);
+ }
+}
Property changes on: trunk/mud4j-core/src/java/net/sf/mud4j/world/MoveableException.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/mud4j-core/src/java/net/sf/mud4j/world/Room.java
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/world/Room.java 2007-10-14 21:55:55 UTC (rev 157)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/world/Room.java 2007-11-01 00:00:59 UTC (rev 158)
@@ -20,6 +20,7 @@
import java.util.List;
import net.sf.mud4j.effect.EffectBehavior;
+import net.sf.mud4j.world.link.TileLocationLink;
/**
* Defines rooms interface as a location that events happen within.
@@ -81,27 +82,6 @@
/**
* {@inheritDoc}
*/
- public void addDirection(Direction direction) {
- directionList.add(direction);
- }
-
- /**
- * {@inheritDoc}
- */
- public void removeDirection(Direction direction) {
- directionList.remove(direction);
- }
-
- /**
- * {@inheritDoc}
- */
- public List<Direction> getDirections() {
- return directionList;
- }
-
- /**
- * {@inheritDoc}
- */
public void move(Placeable placeable) {
placeable.place(this);
}
Modified: trunk/mud4j-core/src/java/net/sf/mud4j/world/TileLocation.java
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/world/TileLocation.java 2007-10-14 21:55:55 UTC (rev 157)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/world/TileLocation.java 2007-11-01 00:00:59 UTC (rev 158)
@@ -17,6 +17,8 @@
import java.util.List;
+import net.sf.mud4j.world.link.TileLocationLink;
+
/**
* Location that represents a single tile that contains
* directions that link to other locations.
@@ -24,21 +26,21 @@
* @author Matthew Purland
*/
public interface TileLocation extends Location {
- /**
- * Add a direction to the location.
- * @param direction Direction to add to the location.
- */
- public void addDirection(Direction direction);
-
- /**
- * Remove a direction from the location.
- * @param direction to remove from the location.
- */
- public void removeDirection(Direction direction);
-
- /**
- * Get list of directions for the location.
- * @return Returns the list implementation for the location.
- */
- public List<Direction> getDirections();
+// /**
+// * Add a link to the location.
+// * @param link Link to add to the location.
+// */
+// public void addLocationLink(TileLocationLink link);
+//
+// /**
+// * Remove a link from the location.
+// * @param link Link to remove from the location.
+// */
+// public void removeLocationLink(TileLocationLink link);
+//
+// /**
+// * Get list of links involving this location.
+// * @return Returns the list implementation for the location.
+// */
+// public List<TileLocationLink> getLinks();
}
Modified: trunk/mud4j-core/src/resources/spring-config.xml
===================================================================
--- trunk/mud4j-core/src/resources/spring-config.xml 2007-10-14 21:55:55 UTC (rev 157)
+++ trunk/mud4j-core/src/resources/spring-config.xml 2007-11-01 00:00:59 UTC (rev 158)
@@ -15,7 +15,7 @@
<value>org.hsqldb.jdbcDriver</value>
</property>
<property name="url">
- <value>jdbc:hsqldb:file:src/resources/hsqldb/data</value>
+ <value>jdbc:hsqldb:file:src/resources/hsqldb/mud4j;hsqldb.default_table_type=cached</value>
</property>
<property name="username">
<value>sa</value>
@@ -25,12 +25,27 @@
</property>
</bean>
+ <!--
+ <bean id="hsqlDatabase" class="org.springmodules.db.hsqldb.ServerBean" lazy-init="false">
+ <property name="dataSource"><ref local="hsqlDataSource"/></property>
+ <property name="serverProperties">
+ <props>
+ <prop key="server.port">9101</prop>
+ <prop key="server.database.0">src/resources/hsqldb</prop>
+ <prop key="server.dbname.0">mud4j</prop>
+ </props>
+ </property>
+ </bean>
+ -->
+
+ <!-- -->
+
<!-- Database Property -->
<bean id="hsqlHibernateProperties"
class="org.springframework.beans.factory.config.PropertiesFactoryBean">
<property name="properties">
<props>
- <prop key="hibernate.hbm2ddl.auto">create-drop</prop>
+ <prop key="hibernate.hbm2ddl.auto">update</prop>
<prop key="hibernate.dialect">
org.hibernate.dialect.HSQLDialect</prop>
<prop key="hibernate.query.substitutions">true 'T', false 'F'</prop>
@@ -116,7 +131,8 @@
<map>
<entry key="timeout" value="5"/>
</map>
- </property>
+ </property>
+ <property name="group" value="mud4j" />
</bean>
<!-- Trigger for ticks -->
Modified: trunk/mud4j-core/src/test/unit/net/sf/mud4j/dao/DaoTest.java
===================================================================
--- trunk/mud4j-core/src/test/unit/net/sf/mud4j/dao/DaoTest.java 2007-10-14 21:55:55 UTC (rev 157)
+++ trunk/mud4j-core/src/test/unit/net/sf/mud4j/dao/DaoTest.java 2007-11-01 00:00:59 UTC (rev 158)
@@ -1,28 +1,62 @@
package net.sf.mud4j.dao;
+import org.springframework.dao.DataAccessException;
+
import net.sf.mud4j.account.Account;
import net.sf.mud4j.test.Mud4jSpringTestBase;
public class DaoTest extends Mud4jSpringTestBase {
-
- public void testAccountDao() {
- AccountDao accountDao = (AccountDao) getApplicationContext().getBean("accountDao");
+
+ public void testAccountDao() {
+ AccountDao accountDao = (AccountDao) getApplicationContext().getBean(
+ "accountDao");
assertNotNull("AccountDao should not be null", accountDao);
}
-
+
public void testAccountDaoFind() {
- AccountDao accountDao = (AccountDao) getApplicationContext().getBean("accountDao");
-
+ AccountDao accountDao = (AccountDao) getApplicationContext().getBean(
+ "accountDao");
+
Account account = new Account();
account.setUsername("someusername");
account.setPassword("somepassword");
-
+
Long accountId = accountDao.save(account);
-
+
Account foundAccount = accountDao.findById(accountId);
- assertEquals("Account was not found correctly.", accountId, foundAccount.getAccountId());
-
+ assertEquals("Account was not found correctly.", accountId,
+ foundAccount.getAccountId());
+
Account foundAccountTwo = accountDao.findByUsername("someusername");
- assertEquals("Account was not found correctly.", accountId, foundAccountTwo.getAccountId());
+ assertEquals("Account was not found correctly.", accountId,
+ foundAccountTwo.getAccountId());
}
+
+ /**
+ * Test when two rows are inserted that findByUsername returns with
+ * exception.
+ *
+ * @todo Username should be unique
+ */
+ public void testAccountDaoFindDataAccessException() {
+ AccountDao accountDao = (AccountDao) getApplicationContext().getBean(
+ "accountDao");
+
+ Account account = new Account();
+ account.setUsername("someusername");
+ account.setPassword("somepassword");
+
+ Long accountId = accountDao.save(account);
+ Long accountId2 = accountDao.save(account);
+
+ boolean exceptionOccurred = false;
+ try {
+ Account foundAccount = accountDao.findByUsername("someusername");
+ }
+ catch (DataAccessException ex) {
+ exceptionOccurred = true;
+ }
+
+ assertTrue(exceptionOccurred);
+ }
}
Modified: trunk/mud4j-core/src/test/unit/net/sf/mud4j/test/Mud4jSpringTestBase.java
===================================================================
--- trunk/mud4j-core/src/test/unit/net/sf/mud4j/test/Mud4jSpringTestBase.java 2007-10-14 21:55:55 UTC (rev 157)
+++ trunk/mud4j-core/src/test/unit/net/sf/mud4j/test/Mud4jSpringTestBase.java 2007-11-01 00:00:59 UTC (rev 158)
@@ -1,7 +1,13 @@
package net.sf.mud4j.test;
+
+import java.lang.reflect.Field;
+import java.util.Properties;
+
import junit.framework.TestCase;
+import net.sf.mud4j.util.SpringHelper;
+import org.springframework.beans.factory.config.PropertiesFactoryBean;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -9,10 +15,38 @@
private ClassPathXmlApplicationContext appContext;
public void setUp() {
- appContext = new ClassPathXmlApplicationContext(
- new String[] { "spring-config.xml" });
+ // Save data and schema
+ boolean saveData = false;
+
+ appContext = SpringHelper.getClassPathXmlApplicationContext(saveData);
+
+ try {
+ hackHibernateProperties();
+ } catch (Exception e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
}
+ public void hackHibernateProperties() throws Exception {
+ //PropertiesFactoryBean hsqlHibernateProperties = (PropertiesFactoryBean) appContext.getBean("hsqlHibernateProperties");
+ Properties hsqlHibernateProperties = (Properties) appContext.getBean("hsqlHibernateProperties");
+// // Hack to get properties to remove hbm2ddl from props
+// Field f = PropertiesFactoryBean.class.getDeclaredField("localProperties");
+// f.setAccessible(true);
+// Properties properties = (Properties) f.get(hsqlHibernateProperties);
+ //hsqlHibernateProperties.remove("hibernate.hbm2ddl.auto");
+ hsqlHibernateProperties.setProperty("hibernate.hbm2ddl.auto", "create-update");
+ appContext.refresh();
+// hsqlHibernateProperties.setProperties(properties);
+// f.setAccessible(false);
+ }
+
+ public void tearDown() {
+ // Tearing down the unit test so close the app context
+ appContext.close();
+ }
+
public ApplicationContext getApplicationContext() {
return appContext;
}
Added: trunk/mud4j-core/src/test/unit/net/sf/mud4j/world/DirectionTest.java
===================================================================
--- trunk/mud4j-core/src/test/unit/net/sf/mud4j/world/DirectionTest.java (rev 0)
+++ trunk/mud4j-core/src/test/unit/net/sf/mud4j/world/DirectionTest.java 2007-11-01 00:00:59 UTC (rev 158)
@@ -0,0 +1,44 @@
+package net.sf.mud4j.world;
+
+import junit.framework.TestCase;
+
+public class DirectionTest extends TestCase {
+
+// /**
+// * Tests when an exception occurs when the placeable is not in the source
+// * location.
+// */
+// public void testDirectionMoveFailure() {
+// Room room1 = new Room();
+// Room room2 = new Room();
+//
+// Placeable placeable = new Placeable() {
+// private Location currentLocation;
+//
+// @Override
+// public Location getCurrentLocation() {
+// return currentLocation;
+// }
+//
+// @Override
+// public void place(Location to) {
+// this.currentLocation = to;
+// }
+//
+// };
+//
+// assertNull("Placeable should be null.", placeable.getCurrentLocation());
+//
+// // Direction going north from room1 to room2
+// Direction direction = new Direction(DirectionName.NORTH, room1, room2);
+//
+// boolean directionMoveFailure = false;
+// try {
+// direction.move(placeable);
+// } catch (MoveableException ex) {
+// directionMoveFailure = true;
+// }
+//
+// assertTrue("Failure must occur when placeable is not in source location.", directionMoveFailure);
+// }
+}
Property changes on: trunk/mud4j-core/src/test/unit/net/sf/mud4j/world/DirectionTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/mud4j-core/src/test/unit/net/sf/mud4j/world/RoomTest.java
===================================================================
--- trunk/mud4j-core/src/test/unit/net/sf/mud4j/world/RoomTest.java (rev 0)
+++ trunk/mud4j-core/src/test/unit/net/sf/mud4j/world/RoomTest.java 2007-11-01 00:00:59 UTC (rev 158)
@@ -0,0 +1,32 @@
+package net.sf.mud4j.world;
+
+import net.sf.mud4j.world.link.LocationLink;
+import net.sf.mud4j.world.link.TileLocationLink;
+
+public class RoomTest {
+ public void testRoomDirection() {
+ // Form a square of rooms
+ // 1-2
+ // | |
+ // 4-3
+ Room room1 = new Room();
+ Room room2 = new Room();
+ Room room3 = new Room();
+ Room room4 = new Room();
+
+ // Link locations room1 and room2 going "east" from room1
+ LocationLink link1and2 = new TileLocationLink(room1, room2, Direction.EAST);
+
+ // Link locations room2 and room3 going "south" from room2
+ LocationLink link2and3 = new TileLocationLink(room2, room3, Direction.SOUTH);
+
+ // Link locations room1 and room2 going "east" from room1
+ LocationLink link3and4 = new TileLocationLink(room3, room4, Direction.WEST);
+
+ // Link locations room2 and room3 going "south" from room2
+ LocationLink link4and1 = new TileLocationLink(room4, room1, Direction.NORTH);
+
+ // @todo Register links with rooms or manager
+ // @todo Test moving Placeable through rooms using link
+ }
+}
Property changes on: trunk/mud4j-core/src/test/unit/net/sf/mud4j/world/RoomTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/mud4j-core/src/test/unit/net/sf/mud4j/world/TileLocationTest.java
===================================================================
--- trunk/mud4j-core/src/test/unit/net/sf/mud4j/world/TileLocationTest.java (rev 0)
+++ trunk/mud4j-core/src/test/unit/net/sf/mud4j/world/TileLocationTest.java 2007-11-01 00:00:59 UTC (rev 158)
@@ -0,0 +1,9 @@
+package net.sf.mud4j.world;
+
+import junit.framework.TestCase;
+
+public class TileLocationTest extends TestCase {
+ public void testMove() {
+
+ }
+}
Property changes on: trunk/mud4j-core/src/test/unit/net/sf/mud4j/world/TileLocationTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mpu...@us...> - 2007-10-14 21:55:57
|
Revision: 157
http://mud4j.svn.sourceforge.net/mud4j/?rev=157&view=rev
Author: mpurland
Date: 2007-10-14 14:55:55 -0700 (Sun, 14 Oct 2007)
Log Message:
-----------
Remove hsql resources. Using src/resources instead.
Removed Paths:
-------------
trunk/mud4j-core/resources/hsqldb/
trunk/mud4j-core/resources/persistence/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mpu...@us...> - 2007-10-06 00:59:44
|
Revision: 155
http://mud4j.svn.sourceforge.net/mud4j/?rev=155&view=rev
Author: mpurland
Date: 2007-10-05 17:59:42 -0700 (Fri, 05 Oct 2007)
Log Message:
-----------
Allow child projects to generate eclipse settings with sources/javadoc.
Modified Paths:
--------------
trunk/mud4j/pom.xml
Modified: trunk/mud4j/pom.xml
===================================================================
--- trunk/mud4j/pom.xml 2007-10-06 00:59:26 UTC (rev 154)
+++ trunk/mud4j/pom.xml 2007-10-06 00:59:42 UTC (rev 155)
@@ -186,7 +186,16 @@
<groupId>org.codehaus.mojo</groupId>
<artifactId>dashboard-maven-plugin</artifactId>
<version>1.0-SNAPSHOT</version>
- </plugin>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ <downloadJavadocs>true</downloadJavadocs>
+ </configuration>
+ </plugin>
</plugins>
</reporting>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mpu...@us...> - 2007-10-06 00:59:31
|
Revision: 154
http://mud4j.svn.sourceforge.net/mud4j/?rev=154&view=rev
Author: mpurland
Date: 2007-10-05 17:59:26 -0700 (Fri, 05 Oct 2007)
Log Message:
-----------
Add Tick and LoginService.
Added Paths:
-----------
trunk/mud4j-core/src/java/net/sf/mud4j/scheduling/Tick.java
trunk/mud4j-core/src/java/net/sf/mud4j/service/LoginService.java
Added: trunk/mud4j-core/src/java/net/sf/mud4j/scheduling/Tick.java
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/scheduling/Tick.java (rev 0)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/scheduling/Tick.java 2007-10-06 00:59:26 UTC (rev 154)
@@ -0,0 +1,5 @@
+package net.sf.mud4j.scheduling;
+
+public class Tick {
+
+}
Property changes on: trunk/mud4j-core/src/java/net/sf/mud4j/scheduling/Tick.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/mud4j-core/src/java/net/sf/mud4j/service/LoginService.java
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/service/LoginService.java (rev 0)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/service/LoginService.java 2007-10-06 00:59:26 UTC (rev 154)
@@ -0,0 +1,57 @@
+package net.sf.mud4j.service;
+import net.sf.mud4j.account.Account;
+import net.sf.mud4j.dao.AccountDao;
+
+import org.hibernate.ObjectNotFoundException;
+import org.springframework.dao.DataAccessException;
+
+
+/**
+ * Provides services for login validation and logging in.
+ *
+ * @author Matthew Purland
+ */
+public class LoginService {
+ private AccountDao accountDao;
+
+ /**
+ * Set the account DAO for the service.
+ *
+ * @param accountDao Account DAO to set.
+ */
+ public void setAccountDao(AccountDao accountDao) {
+ this.accountDao = accountDao;
+ }
+
+ /**
+ * Validate a login through the AccountDAO.
+ *
+ * @param login Login to validate with.
+ * @param password Password to validate the login.
+ * @return Returns true if validation is successful.
+ */
+ public boolean validateLogin(String login, String password) {
+ boolean accountValid = false;
+ Account account = null;
+
+ try {
+ // Find the account by the login
+ account = accountDao.findAccount(login);
+
+ if (account != null && account.validatePassword(password)) {
+ accountValid = true;
+ }
+ }
+ catch (DataAccessException ex) {
+
+ }
+// catch (ObjectRetrievalFailureException ex) {
+// // Do nothing since we cannot validate an account
+// }
+ catch (ObjectNotFoundException ex) {
+ System.err.println("Object not found ex caught.");
+ }
+
+ return accountValid;
+ }
+}
Property changes on: trunk/mud4j-core/src/java/net/sf/mud4j/service/LoginService.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mpu...@us...> - 2007-10-05 15:45:21
|
Revision: 152
http://mud4j.svn.sourceforge.net/mud4j/?rev=152&view=rev
Author: mpurland
Date: 2007-10-05 08:45:18 -0700 (Fri, 05 Oct 2007)
Log Message:
-----------
Add abstract to fix compilation.
Modified Paths:
--------------
trunk/mud4j-core/src/java/net/sf/mud4j/effect/AbstractItemEffect.java
Modified: trunk/mud4j-core/src/java/net/sf/mud4j/effect/AbstractItemEffect.java
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/effect/AbstractItemEffect.java 2007-10-05 15:44:53 UTC (rev 151)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/effect/AbstractItemEffect.java 2007-10-05 15:45:18 UTC (rev 152)
@@ -27,7 +27,7 @@
*
* @author Matthew Purland
*/
-public class AbstractItemEffect extends AbstractEffect implements ItemEffect {
+public abstract class AbstractItemEffect extends AbstractEffect implements ItemEffect {
// Item that the effect will affect.
private Item item;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mpu...@us...> - 2007-10-05 15:44:56
|
Revision: 151
http://mud4j.svn.sourceforge.net/mud4j/?rev=151&view=rev
Author: mpurland
Date: 2007-10-05 08:44:53 -0700 (Fri, 05 Oct 2007)
Log Message:
-----------
Remove aspect package until AspectJ support will be included.
Removed Paths:
-------------
trunk/mud4j-core/src/java/net/sf/mud4j/aspect/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mpu...@us...> - 2007-10-04 21:42:41
|
Revision: 150
http://mud4j.svn.sourceforge.net/mud4j/?rev=150&view=rev
Author: mpurland
Date: 2007-10-04 14:42:39 -0700 (Thu, 04 Oct 2007)
Log Message:
-----------
ADd behaviorable and behavior test.
Added Paths:
-----------
trunk/mud4j-core/src/java/net/sf/mud4j/behavior/Behaviorable.java
trunk/mud4j-core/src/test/unit/net/sf/mud4j/behavior/BehaviorTest.java
Added: trunk/mud4j-core/src/java/net/sf/mud4j/behavior/Behaviorable.java
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/behavior/Behaviorable.java (rev 0)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/behavior/Behaviorable.java 2007-10-04 21:42:39 UTC (rev 150)
@@ -0,0 +1,8 @@
+package net.sf.mud4j.behavior;
+
+public interface Behaviorable {
+ boolean hasBehavior(Class<? extends Behavior> behaviorClass);
+ void addBehavior(Class<? extends Behavior> behaviorClass, Behavior behavior);
+ void removeBehavior(Class<? extends Behavior> behaviorClass);
+ <E extends Behavior> E getBehavior(Class<E> behaviorClass);
+}
\ No newline at end of file
Property changes on: trunk/mud4j-core/src/java/net/sf/mud4j/behavior/Behaviorable.java
___________________________________________________________________
Name: svn:keywords
+ "Author Date Id Revision"
Name: svn:eol-style
+ native
Added: trunk/mud4j-core/src/test/unit/net/sf/mud4j/behavior/BehaviorTest.java
===================================================================
--- trunk/mud4j-core/src/test/unit/net/sf/mud4j/behavior/BehaviorTest.java (rev 0)
+++ trunk/mud4j-core/src/test/unit/net/sf/mud4j/behavior/BehaviorTest.java 2007-10-04 21:42:39 UTC (rev 150)
@@ -0,0 +1,23 @@
+package net.sf.mud4j.behavior;
+
+public class BehaviorTest {
+ public interface PersonBehavior {
+ Person getPerson();
+ }
+
+ public interface Person {
+ String getName();
+ }
+
+ public class PersonA implements Person {
+ private String name;
+
+ public PersonA(String name) {
+ this.name = name;
+ }
+
+ public String getName() {
+ return name;
+ }
+ }
+}
Property changes on: trunk/mud4j-core/src/test/unit/net/sf/mud4j/behavior/BehaviorTest.java
___________________________________________________________________
Name: svn:keywords
+ "Author Date Id Revision"
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mpu...@us...> - 2007-10-04 21:42:19
|
Revision: 149
http://mud4j.svn.sourceforge.net/mud4j/?rev=149&view=rev
Author: mpurland
Date: 2007-10-04 14:42:17 -0700 (Thu, 04 Oct 2007)
Log Message:
-----------
Add behaviors for mud4j core, effectable, and tests
Add prompt shell for telnet server.
Add line terminal input handler.
Start fixing terminal screen buffer.
Removed Paths:
-------------
trunk/mud4j-core/src/java/net/sf/mud4j/world/area/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mpu...@us...> - 2007-10-04 21:42:14
|
Revision: 148
http://mud4j.svn.sourceforge.net/mud4j/?rev=148&view=rev
Author: mpurland
Date: 2007-10-04 14:42:11 -0700 (Thu, 04 Oct 2007)
Log Message:
-----------
Add behaviors for mud4j core, effectable, and tests
Add prompt shell for telnet server.
Add line terminal input handler.
Start fixing terminal screen buffer.
Modified Paths:
--------------
trunk/mud4j-core/src/java/net/sf/mud4j/ability/CharacterAbility.java
trunk/mud4j-core/src/java/net/sf/mud4j/damage/AbstractDamageBehavior.java
trunk/mud4j-core/src/java/net/sf/mud4j/damage/DamageBehavior.java
trunk/mud4j-core/src/java/net/sf/mud4j/damage/DamageListener.java
trunk/mud4j-core/src/java/net/sf/mud4j/effect/AbstractEffect.java
trunk/mud4j-core/src/java/net/sf/mud4j/effect/AbstractItemEffect.java
trunk/mud4j-core/src/java/net/sf/mud4j/effect/Effect.java
trunk/mud4j-core/src/java/net/sf/mud4j/world/Direction.java
trunk/mud4j-core/src/test/unit/net/mud4j/game/effect/CharacterEffectTest.java
trunk/mud4j-core/src/test/unit/net/mud4j/game/effect/MockCharacterEffect.java
Added Paths:
-----------
trunk/mud4j-core/src/java/net/sf/mud4j/ability/TestBehavior.java
trunk/mud4j-core/src/java/net/sf/mud4j/behavior/
trunk/mud4j-core/src/java/net/sf/mud4j/behavior/Behavior.java
trunk/mud4j-core/src/java/net/sf/mud4j/behavior/BehaviorManager.java
trunk/mud4j-core/src/java/net/sf/mud4j/damage/PointDamageEvent.java
trunk/mud4j-core/src/java/net/sf/mud4j/effect/EffectableBehavior.java
trunk/mud4j-core/src/java/net/sf/mud4j/map/ZoneMap.java
trunk/mud4j-core/src/test/unit/net/mud4j/game/effect/EffectableBehaviorTest.java
trunk/mud4j-core/src/test/unit/net/sf/
trunk/mud4j-core/src/test/unit/net/sf/mud4j/
trunk/mud4j-core/src/test/unit/net/sf/mud4j/behavior/
Removed Paths:
-------------
trunk/mud4j-core/src/java/net/sf/mud4j/effect/CharacterEffectDecorator.java
trunk/mud4j-core/src/java/net/sf/mud4j/effect/LocationEffectDecorator.java
trunk/mud4j-core/src/java/net/sf/mud4j/map/AreaMap.java
Modified: trunk/mud4j-core/src/java/net/sf/mud4j/ability/CharacterAbility.java
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/ability/CharacterAbility.java 2007-10-04 21:41:58 UTC (rev 147)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/ability/CharacterAbility.java 2007-10-04 21:42:11 UTC (rev 148)
@@ -45,7 +45,7 @@
*/
public Character getCharacter() {
return this.character;
- }
+ }
/**
* {@inheritDoc}
Added: trunk/mud4j-core/src/java/net/sf/mud4j/ability/TestBehavior.java
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/ability/TestBehavior.java (rev 0)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/ability/TestBehavior.java 2007-10-04 21:42:11 UTC (rev 148)
@@ -0,0 +1,131 @@
+package net.sf.mud4j.ability;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import net.sf.mud4j.behavior.BehaviorManager;
+import net.sf.mud4j.effect.Effect;
+import net.sf.mud4j.effect.EffectException;
+import net.sf.mud4j.effect.EffectableBehavior;
+
+public class TestBehavior {
+
+
+ // Adds behaviorability to a person
+ public class PersonBehaviorDecorator extends BehaviorManager implements Person {
+ private Person person;
+
+ public PersonBehaviorDecorator(Person person) {
+ this.person = person;
+ }
+
+ public String getName() {
+ return person.getName();
+ }
+ }
+
+ public interface PersonBehavior {
+ Person getPerson();
+ }
+
+ public interface Person {
+ String getName();
+ }
+
+ public class PersonA implements Person {
+ private String name;
+
+ public PersonA(String name) {
+ this.name = name;
+ }
+
+ public String getName() {
+ return name;
+ }
+ }
+
+ public interface PersonFlyEffect extends Effect {
+ }
+
+ public class PersonFlyWithWingsEffect implements PersonFlyEffect {
+ private Person person;
+
+ public PersonFlyWithWingsEffect(Person person) {
+ this.person = person;
+ }
+
+ private void applyFlying(Person person) {
+ System.out.println("Person: " + person.getName() + " is now flying with wings.");
+ }
+
+ public void apply() throws EffectException {
+ applyFlying(person);
+ }
+
+ public String getName() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean hasExpired() {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ public boolean isPermanent() {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ public void undo() throws EffectException {
+ System.out.println("Person: " + person.getName() + " is not flying with wings.");
+ }
+ }
+
+ public class DefaultEffectableBehavior implements EffectableBehavior {
+
+ Map<Class<? extends Effect>, Effect> effectMap = new HashMap<Class<? extends Effect>, Effect>();
+
+ public void addEffect(Class<? extends Effect> effectClass, Effect effect) {
+ effectMap.put(effectClass, effect);
+ }
+
+ public boolean hasEffect(Class<? extends Effect> effectClass) {
+ return effectMap.containsKey(effectClass);
+ }
+
+ public void removeEffect(Class<? extends Effect> effectClass) {
+ effectMap.remove(effectClass);
+ }
+
+ public <E extends Effect> E getEffect(Class<E> effectClass) {
+ return (E) effectMap.get(effectClass);
+ }
+ }
+
+ public void run() {
+ Person personA = new PersonA("PersonA");
+ PersonBehaviorDecorator personAWithBehaviorable = new PersonBehaviorDecorator(personA);
+ personAWithBehaviorable.addBehavior(EffectableBehavior.class, new DefaultEffectableBehavior());
+ EffectableBehavior effectableBehavior = personAWithBehaviorable.getBehavior(EffectableBehavior.class);
+
+ PersonFlyWithWingsEffect personCanFlyEffect = new PersonFlyWithWingsEffect(personA);
+ effectableBehavior.addEffect(PersonFlyEffect.class, personCanFlyEffect);
+
+ personCanFlyEffect.apply();
+ if (effectableBehavior.hasEffect(PersonFlyEffect.class)) {
+ System.out.println("Has fly effect.");
+ //PersonFlyEffect effect = effectableBehavior.getEffect(PersonFlyEffect.class);
+ effectableBehavior.removeEffect(PersonFlyEffect.class);
+ }
+
+ System.out.println("A");
+ }
+
+ public static void main(String[] args) {
+ TestBehavior testBehavior = new TestBehavior();
+ testBehavior.run();
+ }
+}
Property changes on: trunk/mud4j-core/src/java/net/sf/mud4j/ability/TestBehavior.java
___________________________________________________________________
Name: svn:keywords
+ "Author Date Id Revision"
Name: svn:eol-style
+ native
Added: trunk/mud4j-core/src/java/net/sf/mud4j/behavior/Behavior.java
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/behavior/Behavior.java (rev 0)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/behavior/Behavior.java 2007-10-04 21:42:11 UTC (rev 148)
@@ -0,0 +1,5 @@
+package net.sf.mud4j.behavior;
+
+// Marker interface
+public interface Behavior {
+}
Property changes on: trunk/mud4j-core/src/java/net/sf/mud4j/behavior/Behavior.java
___________________________________________________________________
Name: svn:keywords
+ "Author Date Id Revision"
Name: svn:eol-style
+ native
Added: trunk/mud4j-core/src/java/net/sf/mud4j/behavior/BehaviorManager.java
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/behavior/BehaviorManager.java (rev 0)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/behavior/BehaviorManager.java 2007-10-04 21:42:11 UTC (rev 148)
@@ -0,0 +1,24 @@
+package net.sf.mud4j.behavior;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class BehaviorManager implements Behaviorable {
+ Map<Class<? extends Behavior>, Behavior> behaviorMap = new HashMap<Class<? extends Behavior>, Behavior>();
+
+ public void addBehavior(Class<? extends Behavior> behaviorClass, Behavior behavior) {
+ behaviorMap.put(behaviorClass, behavior);
+ }
+
+ public boolean hasBehavior(Class<? extends Behavior> behaviorClass) {
+ return behaviorMap.containsKey(behaviorClass);
+ }
+
+ public void removeBehavior(Class<? extends Behavior> behaviorClass) {
+ behaviorMap.remove(behaviorClass);
+ }
+
+ public <E extends Behavior> E getBehavior(Class<E> behaviorClass) {
+ return (E)behaviorMap.get(behaviorClass);
+ }
+}
Property changes on: trunk/mud4j-core/src/java/net/sf/mud4j/behavior/BehaviorManager.java
___________________________________________________________________
Name: svn:keywords
+ "Author Date Id Revision"
Name: svn:eol-style
+ native
Modified: trunk/mud4j-core/src/java/net/sf/mud4j/damage/AbstractDamageBehavior.java
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/damage/AbstractDamageBehavior.java 2007-10-04 21:41:58 UTC (rev 147)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/damage/AbstractDamageBehavior.java 2007-10-04 21:42:11 UTC (rev 148)
@@ -24,8 +24,8 @@
*
* @author Matthew Purland
*/
-public abstract class AbstractDamageBehavior implements DamageBehavior {
- private List<DamageListener> damageListeners;
+public abstract class AbstractDamageBehavior<D extends DamageListener> implements DamageBehavior<D> {
+ private List<D> damageListeners;
private boolean isDestroyed;
/**
@@ -40,7 +40,7 @@
isDestroyed = true;
// Iterate through list of damage listeners
- for (DamageListener listener : damageListeners) {
+ for (D listener : damageListeners) {
DamageEvent event = new DamageEvent(this);
event.setDestroyed(isDestroyed);
listener.damageDestroyed(event);
@@ -57,14 +57,14 @@
/**
* {@inheritDoc}
*/
- public void removeDamageListener(DamageListener listener) {
+ public void removeDamageListener(D listener) {
damageListeners.remove(listener);
}
/**
* {@inheritDoc}
*/
- public void addDamageListener(DamageListener listener) {
+ public void addDamageListener(D listener) {
damageListeners.add(listener);
}
}
Modified: trunk/mud4j-core/src/java/net/sf/mud4j/damage/DamageBehavior.java
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/damage/DamageBehavior.java 2007-10-04 21:41:58 UTC (rev 147)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/damage/DamageBehavior.java 2007-10-04 21:42:11 UTC (rev 148)
@@ -23,7 +23,7 @@
* @author Matthew Purland
* @see PointDamageBehavior
*/
-public interface DamageBehavior {
+public interface DamageBehavior<D extends DamageListener> {
/**
* Inflict damage on the object.
*/
@@ -42,10 +42,10 @@
/**
* Add a damage listener to this damage behavior.
*/
- public void addDamageListener(DamageListener listener);
+ public void addDamageListener(D listener);
/**
* Remove a damage listener from this damage behavior.
*/
- public void removeDamageListener(DamageListener listener);
+ public void removeDamageListener(D listener);
}
Modified: trunk/mud4j-core/src/java/net/sf/mud4j/damage/DamageListener.java
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/damage/DamageListener.java 2007-10-04 21:41:58 UTC (rev 147)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/damage/DamageListener.java 2007-10-04 21:42:11 UTC (rev 148)
@@ -21,17 +21,17 @@
/**
* The listener interface for receiving damage events.
*/
-public interface DamageListener extends EventListener {
+public interface DamageListener<E extends DamageEvent> extends EventListener {
/**
* Event called when damage is inflicted.
*/
- public void damageInflicted(DamageEvent event);
+ public void damageInflicted(E event);
/**
* Event called when enough damage is done that destroys the object.
*/
- public void damageDestroyed(DamageEvent event);
+ public void damageDestroyed(E event);
}
Added: trunk/mud4j-core/src/java/net/sf/mud4j/damage/PointDamageEvent.java
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/damage/PointDamageEvent.java (rev 0)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/damage/PointDamageEvent.java 2007-10-04 21:42:11 UTC (rev 148)
@@ -0,0 +1,5 @@
+package net.sf.mud4j.damage;
+
+public class PointDamageEvent {
+
+}
Property changes on: trunk/mud4j-core/src/java/net/sf/mud4j/damage/PointDamageEvent.java
___________________________________________________________________
Name: svn:keywords
+ "Author Date Id Revision"
Name: svn:eol-style
+ native
Modified: trunk/mud4j-core/src/java/net/sf/mud4j/effect/AbstractEffect.java
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/effect/AbstractEffect.java 2007-10-04 21:41:58 UTC (rev 147)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/effect/AbstractEffect.java 2007-10-04 21:42:11 UTC (rev 148)
@@ -58,4 +58,9 @@
* {@inheritDoc}
*/
abstract public void apply() throws EffectException;
+
+ /**
+ * {@inheritDoc}
+ */
+ abstract public boolean isPermanent();
}
Modified: trunk/mud4j-core/src/java/net/sf/mud4j/effect/AbstractItemEffect.java
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/effect/AbstractItemEffect.java 2007-10-04 21:41:58 UTC (rev 147)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/effect/AbstractItemEffect.java 2007-10-04 21:42:11 UTC (rev 148)
@@ -19,7 +19,7 @@
import net.sf.mud4j.world.item.Item;
/**
- * Abstract item effect imlementation to implement all
+ * Abstract item effect implementation to implement all
* necessary functionality for an extending class to use
* and implement business item effect data. Extending
* from this class will provide the class with core item
@@ -57,14 +57,4 @@
public void undo() throws EffectException {
item.getEffectBehavior().removeEffect(this);
}
-
- /**
- * {@inheritDoc}
- */
- public boolean isPermanent() {
- // TODO Auto-generated method stub
- return false;
- }
-
-
}
Deleted: trunk/mud4j-core/src/java/net/sf/mud4j/effect/CharacterEffectDecorator.java
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/effect/CharacterEffectDecorator.java 2007-10-04 21:41:58 UTC (rev 147)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/effect/CharacterEffectDecorator.java 2007-10-04 21:42:11 UTC (rev 148)
@@ -1,103 +0,0 @@
-/**
- * Copyright 2006 Matthew Purland (m.p...@gm...)
- *
- * 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 net.sf.mud4j.effect;
-
-import java.io.IOException;
-import java.util.List;
-
-import net.sf.mud4j.ability.CharacterAbility;
-import net.sf.mud4j.character.Character;
-import net.sf.mud4j.damage.DamageBehavior;
-import net.sf.mud4j.world.item.Item;
-
-/**
- * Provide effects as a decorator to a character.
- *
- * @author Matthew Purland
- */
-public abstract class CharacterEffectDecorator implements Character, Effectable {
-
- // Character to decorate
- private Character character;
-
- public CharacterEffectDecorator(Character character) {
- this.character = character;
- }
-
- /**
- * {@inheritDoc}
- */
- public List<CharacterAbility> getAbilities() {
- return character.getAbilities();
- }
-
- /**
- * {@inheritDoc}
- */
- public List<Item> getItems() {
- return character.getItems();
- }
-
- /**
- * {@inheritDoc}
- */
- public int getLevel() {
- return character.getLevel();
- }
-
- /**
- * {@inheritDoc}
- */
- public String getName() {
- return character.getName();
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean hasAbility(CharacterAbility ability) {
- return character.hasAbility(ability);
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean hasItem(Item item) {
- return character.hasItem(item);
- }
-
- /**
- * {@inheritDoc}
- */
- public DamageBehavior getDamageBehavior() {
- return character.getDamageBehavior();
- }
-
- /**
- * {@inheritDoc}
- */
- public void setDamageBehavior(DamageBehavior damageBehavior) {
- character.setDamageBehavior(damageBehavior);
- }
-
- /**
- * {@inheritDoc}
- */
- public void message(String message) throws IOException {
- character.message(message);
- }
-
-}
Modified: trunk/mud4j-core/src/java/net/sf/mud4j/effect/Effect.java
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/effect/Effect.java 2007-10-04 21:41:58 UTC (rev 147)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/effect/Effect.java 2007-10-04 21:42:11 UTC (rev 148)
@@ -29,21 +29,21 @@
*
* @throws EffectException in case of an apply failure.
*/
- public void apply() throws EffectException;
+ void apply() throws EffectException;
/**
* Undo the effect from the target.
*
* @throws EffectException in case of an undo failure.
*/
- public void undo() throws EffectException;
+ void undo() throws EffectException;
/**
* Determine if the effect has expired duration.
*
* @return Returns whether the effect has expired yet.
*/
- public boolean hasExpired();
+ boolean hasExpired();
/**
* Determine if the effect is permanent. Permanent status means that the
@@ -52,12 +52,12 @@
* @return Retruns whether the effect is a permanent effect and cannot
* expire.
*/
- public boolean isPermanent();
+ boolean isPermanent();
/**
* Get name of the effect.
*
* @return Returns the name of the effect.
*/
- public String getName();
+ String getName();
}
Added: trunk/mud4j-core/src/java/net/sf/mud4j/effect/EffectableBehavior.java
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/effect/EffectableBehavior.java (rev 0)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/effect/EffectableBehavior.java 2007-10-04 21:42:11 UTC (rev 148)
@@ -0,0 +1,10 @@
+package net.sf.mud4j.effect;
+
+import net.sf.mud4j.behavior.Behavior;
+
+public interface EffectableBehavior extends Behavior {
+ boolean hasEffect(Class<? extends Effect> effectClass);
+ void addEffect(Class<? extends Effect> effectClass, Effect effect);
+ void removeEffect(Class<? extends Effect> effectClass);
+ <E extends Effect> E getEffect(Class<E> effectClass);
+}
\ No newline at end of file
Property changes on: trunk/mud4j-core/src/java/net/sf/mud4j/effect/EffectableBehavior.java
___________________________________________________________________
Name: svn:keywords
+ "Author Date Id Revision"
Name: svn:eol-style
+ native
Deleted: trunk/mud4j-core/src/java/net/sf/mud4j/effect/LocationEffectDecorator.java
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/effect/LocationEffectDecorator.java 2007-10-04 21:41:58 UTC (rev 147)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/effect/LocationEffectDecorator.java 2007-10-04 21:42:11 UTC (rev 148)
@@ -1,48 +0,0 @@
-/**
- * Copyright 2006 Matthew Purland (m.p...@gm...)
- *
- * 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 net.sf.mud4j.effect;
-
-import net.sf.mud4j.world.Location;
-import net.sf.mud4j.world.Placeable;
-
-/**
- * Provide effect decorator/wrapping around a {@link Location}. Will delegate
- * {@link Location} interface to wrapped object.
- *
- * @author Matthew Purland
- */
-public abstract class LocationEffectDecorator implements Effectable, Location {
-
- // Location that is being decorated
- private Location location;
-
- /**
- * Constructor to create an effect decorating a given location.
- *
- * @param location Location to decorate.
- */
- public LocationEffectDecorator(Location location) {
- this.location = location;
- }
-
- /**
- * {@inheritDoc}
- */
- public void move(Placeable placeable) {
- location.move(placeable);
- }
-
-}
Deleted: trunk/mud4j-core/src/java/net/sf/mud4j/map/AreaMap.java
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/map/AreaMap.java 2007-10-04 21:41:58 UTC (rev 147)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/map/AreaMap.java 2007-10-04 21:42:11 UTC (rev 148)
@@ -1,27 +0,0 @@
-/**
- * Copyright 2006 Matthew Purland (m.p...@gm...)
- *
- * 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 net.sf.mud4j.map;
-
-/**
- * Game map of
- *
- * @author Matthew Purland
- *
- */
-public interface AreaMap {
-
-}
Copied: trunk/mud4j-core/src/java/net/sf/mud4j/map/ZoneMap.java (from rev 146, trunk/mud4j-core/src/java/net/sf/mud4j/map/AreaMap.java)
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/map/ZoneMap.java (rev 0)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/map/ZoneMap.java 2007-10-04 21:42:11 UTC (rev 148)
@@ -0,0 +1,27 @@
+/**
+ * Copyright 2006 Matthew Purland (m.p...@gm...)
+ *
+ * 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 net.sf.mud4j.map;
+
+/**
+ * Map of a zone containing rooms.
+ *
+ * @author Matthew Purland
+ *
+ */
+public interface ZoneMap {
+
+}
Modified: trunk/mud4j-core/src/java/net/sf/mud4j/world/Direction.java
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/world/Direction.java 2007-10-04 21:41:58 UTC (rev 147)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/world/Direction.java 2007-10-04 21:42:11 UTC (rev 148)
@@ -23,8 +23,25 @@
* @author Matthew Purland
*/
public class Direction {
+
+ public enum DirectionName {
+ NORTH("north"),
+ EAST("east"),
+ WEST("west"),
+ SOUTH("south");
+
+ private String directionName;
+
+ DirectionName(String directionName) {
+ this.directionName = directionName;
+ }
+
+ public String getDirectionName() {
+ return directionName;
+ }
+ }
- private String directionName;
+ private DirectionName directionName;
/**
* Direction is from source to target location. Example. If direction is
@@ -40,7 +57,7 @@
* @param sourceLocation Source of the location to the target
* @param targetLocation Target of the location from the source
*/
- public Direction(String directionName, TileLocation sourceLocation,
+ public Direction(DirectionName directionName, TileLocation sourceLocation,
TileLocation targetLocation) {
this.directionName = directionName;
this.sourceLocation = sourceLocation;
@@ -50,7 +67,7 @@
/**
* Get name of direction.
*/
- public String getDirectionName() {
+ public DirectionName getDirectionName() {
return directionName;
}
Modified: trunk/mud4j-core/src/test/unit/net/mud4j/game/effect/CharacterEffectTest.java
===================================================================
--- trunk/mud4j-core/src/test/unit/net/mud4j/game/effect/CharacterEffectTest.java 2007-10-04 21:41:58 UTC (rev 147)
+++ trunk/mud4j-core/src/test/unit/net/mud4j/game/effect/CharacterEffectTest.java 2007-10-04 21:42:11 UTC (rev 148)
@@ -54,14 +54,9 @@
/**
* Test the ability to apply an effect on a character.
*/
- public void testCharacterEffectApply() {
- try {
- effect.apply();
- effectBehavior.addEffect(effect);
- }
- catch (EffectException ex) {
-
- }
+ public void testCharacterEffectApply() throws EffectException {
+ effect.apply();
+ effectBehavior.addEffect(effect);
// Assert that the effect behavior contains the effect
assertTrue(character.getEffectBehavior().getEffects().contains(effect));
@@ -75,15 +70,16 @@
/**
* Test the ability to undo an effect on a character.
*/
- public void testCharacterEffectUndo() {
- try {
- effect.undo();
- effectBehavior.removeEffect(effect);
- }
- catch (EffectException ex) {
-
- }
+ public void testCharacterEffectUndo() throws EffectException {
+ effect.apply();
+ effectBehavior.addEffect(effect);
+
+ // Assert that the effect behavior contains the effect
+ assertTrue(character.getEffectBehavior().getEffects().contains(effect));
+ effect.undo();
+ effectBehavior.removeEffect(effect);
+
// Assert that the effect behavior DOES NOT contain the effect
assertFalse(character.getEffectBehavior().getEffects().contains(effect));
}
@@ -91,19 +87,13 @@
/**
* Test the effect of permanent/non-permanent effects.
*/
- public void testCharacterEffectPermanent() {
- try {
- effect.apply();
- effectBehavior.addEffect(effect);
- }
- catch (EffectException ex) {
-
- }
+ public void testCharacterEffectPermanent() throws EffectException {
+ effect.apply();
+ effectBehavior.addEffect(effect);
// Iterate through all effects and make sure all are not permanent.
for (Effect effect : effectBehavior.getEffects()) {
assertFalse(effect.isPermanent());
- }
-
+ }
}
}
Added: trunk/mud4j-core/src/test/unit/net/mud4j/game/effect/EffectableBehaviorTest.java
===================================================================
--- trunk/mud4j-core/src/test/unit/net/mud4j/game/effect/EffectableBehaviorTest.java (rev 0)
+++ trunk/mud4j-core/src/test/unit/net/mud4j/game/effect/EffectableBehaviorTest.java 2007-10-04 21:42:11 UTC (rev 148)
@@ -0,0 +1,6 @@
+package net.mud4j.game.effect;
+
+
+public class EffectableBehaviorTest {
+
+}
Property changes on: trunk/mud4j-core/src/test/unit/net/mud4j/game/effect/EffectableBehaviorTest.java
___________________________________________________________________
Name: svn:keywords
+ "Author Date Id Revision"
Name: svn:eol-style
+ native
Modified: trunk/mud4j-core/src/test/unit/net/mud4j/game/effect/MockCharacterEffect.java
===================================================================
--- trunk/mud4j-core/src/test/unit/net/mud4j/game/effect/MockCharacterEffect.java 2007-10-04 21:41:58 UTC (rev 147)
+++ trunk/mud4j-core/src/test/unit/net/mud4j/game/effect/MockCharacterEffect.java 2007-10-04 21:42:11 UTC (rev 148)
@@ -24,7 +24,12 @@
* @author Matthew Purland
*/
public class MockCharacterEffect extends AbstractCharacterEffect {
-
+
+ // Effect as non permanent by default.
+ private boolean isPermanent = false;
+ private boolean isApplied = false;
+
+
/**
* Constructor to provide injection for character on to effect.
* @param character Character to set for the effect.
@@ -45,8 +50,7 @@
*/
@Override
public void apply() {
- // TODO Auto-generated method stub
-
+ isApplied = true;
}
/**
@@ -54,16 +58,21 @@
*/
@Override
public void undo() {
- // TODO Auto-generated method stub
-
+ isApplied = false;
}
/**
* {@inheritDoc}
*/
public boolean isPermanent() {
- // Place this effect as non permanent.
- return false;
+ return isPermanent;
}
+
+ /**
+ * Set permanent to true.
+ */
+ public void setPermanent() {
+ isPermanent = true;
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mpu...@us...> - 2007-10-04 21:42:00
|
Revision: 147
http://mud4j.svn.sourceforge.net/mud4j/?rev=147&view=rev
Author: mpurland
Date: 2007-10-04 14:41:58 -0700 (Thu, 04 Oct 2007)
Log Message:
-----------
Add behaviors for mud4j core, effectable, and tests
Add prompt shell for telnet server.
Add line terminal input handler.
Start fixing terminal screen buffer.
Modified Paths:
--------------
trunk/mud4j-telnet/src/java/net/sf/mud4j/telnet/server/DefaultTelnetServer.java
trunk/mud4j-telnet/src/java/net/sf/mud4j/telnet/shell/AbstractScreenBuffer.java
trunk/mud4j-telnet/src/java/net/sf/mud4j/telnet/shell/AbstractTelnetShell.java
trunk/mud4j-telnet/src/java/net/sf/mud4j/telnet/shell/AbstractTerminalInputHandler.java
trunk/mud4j-telnet/src/java/net/sf/mud4j/telnet/shell/Mud4jTelnetLoginShell.java
trunk/mud4j-telnet/src/java/net/sf/mud4j/telnet/shell/TerminalInputHandler.java
trunk/mud4j-telnet/src/java/net/sf/mud4j/telnet/shell/TerminalScreenBuffer.java
Added Paths:
-----------
trunk/mud4j-telnet/src/java/net/sf/mud4j/telnet/shell/LineTerminalInputHandler.java
trunk/mud4j-telnet/src/java/net/sf/mud4j/telnet/shell/Mud4jTelnetPromptShell.java
Modified: trunk/mud4j-telnet/src/java/net/sf/mud4j/telnet/server/DefaultTelnetServer.java
===================================================================
--- trunk/mud4j-telnet/src/java/net/sf/mud4j/telnet/server/DefaultTelnetServer.java 2007-10-03 04:46:38 UTC (rev 146)
+++ trunk/mud4j-telnet/src/java/net/sf/mud4j/telnet/server/DefaultTelnetServer.java 2007-10-04 21:41:58 UTC (rev 147)
@@ -35,10 +35,10 @@
properties.put("term.vt100.class", "net.wimpi.telnetd.io.terminal.vt100");
properties.put("term.vt100.aliases", "default,vt100-am,vt102,dec-vt10");
- properties.put("shells", "editor,login");
+ properties.put("shells", "editor,login,prompt");
properties.put("shell.editor.class", "net.sf.mud4j.telnet.shell.Mud4jTelnetEditorShell");
properties.put("shell.login.class", "net.sf.mud4j.telnet.shell.Mud4jTelnetLoginShell");
-
+ properties.put("shell.prompt.class", "net.sf.mud4j.telnet.shell.Mud4jTelnetPromptShell");
properties.put("listeners", "std");
properties.put("std.port", "6666");
Modified: trunk/mud4j-telnet/src/java/net/sf/mud4j/telnet/shell/AbstractScreenBuffer.java
===================================================================
--- trunk/mud4j-telnet/src/java/net/sf/mud4j/telnet/shell/AbstractScreenBuffer.java 2007-10-03 04:46:38 UTC (rev 146)
+++ trunk/mud4j-telnet/src/java/net/sf/mud4j/telnet/shell/AbstractScreenBuffer.java 2007-10-04 21:41:58 UTC (rev 147)
@@ -59,14 +59,11 @@
* @return Returns true if the position is valid; false otherwise.
*/
protected boolean isValidPosition(int x, int y) {
- boolean positionValid = true;
+ boolean positionValid = false;
- if (x > screenWidth || x < 0) {
- positionValid = false;
+ if (x < screenWidth && y < screenHeight) {
+ positionValid = true;
}
- else if (y > screenHeight || y < 0) {
- positionValid = false;
- }
return positionValid;
}
@@ -245,7 +242,7 @@
// Check if we can fit more on the current line
if (isValidPosition(xPos, yPos)) {
- if (isEndOfLine(xPos)) {
+ if (isEndOfLine(xPos) && isValidPosition(xPos, getNextLine())) {
moveCursorToNextLine();
}
else {
@@ -254,12 +251,17 @@
}
}
// The current line has too much. Move the cursor to the next line.
- else {
+ else if (isValidPosition(xPos, getNextLine())) {
moveCursorToNextLine();
}
-
StringBuffer buffer = getCurrentLineBuffer();
- buffer.append(character);
+ // If at end of line with no more lines
+ if (xPos < screenWidth) {
+ buffer.append(character);
+ }
+ else {
+ buffer.setCharAt(buffer.length() - 1, character);
+ }
}
/**
@@ -270,12 +272,16 @@
write(string.charAt(i));
}
}
+
+ public int getNextLine() {
+ return cursorPosition.y + 1;
+ }
/**
* {@inheritDoc}
*/
public void moveCursorToNextLine() {
- setCursorPosition(0, cursorPosition.y + 1);
+ setCursorPosition(0, getNextLine());
}
/**
Modified: trunk/mud4j-telnet/src/java/net/sf/mud4j/telnet/shell/AbstractTelnetShell.java
===================================================================
--- trunk/mud4j-telnet/src/java/net/sf/mud4j/telnet/shell/AbstractTelnetShell.java 2007-10-03 04:46:38 UTC (rev 146)
+++ trunk/mud4j-telnet/src/java/net/sf/mud4j/telnet/shell/AbstractTelnetShell.java 2007-10-04 21:41:58 UTC (rev 147)
@@ -76,11 +76,18 @@
protected BasicTerminalIO getTerminalIO() {
return terminalIO;
}
+
+ /**
+ * Read a command followed by an enter or return.
+ */
+ protected String readWord() {
+ return readWord(false);
+ }
/**
* Read a command followed by an enter or return.
*/
- protected String readWord() {
+ protected String readWord(boolean backspaceAllowed) {
boolean isInterrupted = false;
StringBuffer currentLineBuffer = new StringBuffer();
@@ -93,10 +100,22 @@
if (!TerminalUtil.isControlCharacter(c)) {
currentLineBuffer.append(c);
+
+
// Echo to the terminal the character
+ // @todo Only echo if we have echo turned off as telnet opt
terminalIO.write(c);
}
+ if (charValue == BasicTerminalIO.BACKSPACE) {
+ int index = currentLineBuffer.length() - 1;
+
+ if (currentLineBuffer.length() > 1) {
+ currentLineBuffer.deleteCharAt(index);
+ terminalIO.write(c);
+ }
+ }
+
/**
* Once we receive a return we have read the word.
*/
Modified: trunk/mud4j-telnet/src/java/net/sf/mud4j/telnet/shell/AbstractTerminalInputHandler.java
===================================================================
--- trunk/mud4j-telnet/src/java/net/sf/mud4j/telnet/shell/AbstractTerminalInputHandler.java 2007-10-03 04:46:38 UTC (rev 146)
+++ trunk/mud4j-telnet/src/java/net/sf/mud4j/telnet/shell/AbstractTerminalInputHandler.java 2007-10-04 21:41:58 UTC (rev 147)
@@ -16,6 +16,8 @@
package net.sf.mud4j.telnet.shell;
import java.awt.Point;
+import java.util.HashSet;
+import java.util.Set;
import net.wimpi.telnetd.io.BasicTerminalIO;
@@ -29,6 +31,8 @@
// Internal screen buffer
private ScreenBuffer screenBuffer;
+ private Set<TerminalKey> allowedKeySet;
+
/**
* Construct a new instance with a ScreenBuffer instance.
*
@@ -36,7 +40,23 @@
*/
public AbstractTerminalInputHandler(ScreenBuffer screenBuffer) {
this.screenBuffer = screenBuffer;
+ this.allowedKeySet = new HashSet<TerminalKey>();
+
+ // Add every terminal key
+ for (TerminalKey terminalKey : TerminalKey.values()) {
+ allowedKeySet.add(terminalKey);
+ }
}
+
+ /**
+ * Construct a new instance with a ScreenBuffer instance with an allowed key set.
+ *
+ * @param screenBuffer ScreenBuffer to use.
+ */
+ public AbstractTerminalInputHandler(ScreenBuffer screenBuffer, Set<TerminalKey> allowedKeySet) {
+ this.screenBuffer = screenBuffer;
+ this.allowedKeySet = allowedKeySet;
+ }
/**
* {@inheritDoc}
@@ -47,25 +67,25 @@
// Point cursorPosition = screenBuffer.getCursorPosition();
if (TerminalUtil.isControlCharacter(inputCharacter)) {
- if (input == BasicTerminalIO.UP) {
+ if (allowedKeySet.contains(TerminalKey.UP) && input == BasicTerminalIO.UP) {
screenBuffer.moveCursorUp();
}
- else if (input == BasicTerminalIO.DOWN) {
+ else if (allowedKeySet.contains(TerminalKey.DOWN) && input == BasicTerminalIO.DOWN) {
screenBuffer.moveCursorDown();
}
- else if (input == BasicTerminalIO.LEFT) {
+ else if (allowedKeySet.contains(TerminalKey.LEFT) && input == BasicTerminalIO.LEFT) {
screenBuffer.moveCursorLeft();
}
- else if (input == BasicTerminalIO.RIGHT) {
+ else if (allowedKeySet.contains(TerminalKey.RIGHT) && input == BasicTerminalIO.RIGHT) {
screenBuffer.moveCursorRight();
}
- else if (TerminalUtil.isBackspaceCharacter(inputCharacter)) {
+ else if (allowedKeySet.contains(TerminalKey.BACKSPACE) && TerminalUtil.isBackspaceCharacter(inputCharacter)) {
screenBuffer.backspace();
}
- else if (TerminalUtil.isDeleteCharacter(inputCharacter)) {
+ else if (allowedKeySet.contains(TerminalKey.DELETE) && TerminalUtil.isDeleteCharacter(inputCharacter)) {
screenBuffer.delete();
}
- else if (input == BasicTerminalIO.ENTER) {
+ else if (allowedKeySet.contains(TerminalKey.ENTER) && input == BasicTerminalIO.ENTER) {
screenBuffer.enter();
}
}
Added: trunk/mud4j-telnet/src/java/net/sf/mud4j/telnet/shell/LineTerminalInputHandler.java
===================================================================
--- trunk/mud4j-telnet/src/java/net/sf/mud4j/telnet/shell/LineTerminalInputHandler.java (rev 0)
+++ trunk/mud4j-telnet/src/java/net/sf/mud4j/telnet/shell/LineTerminalInputHandler.java 2007-10-04 21:41:58 UTC (rev 147)
@@ -0,0 +1,12 @@
+package net.sf.mud4j.telnet.shell;
+
+public class LineTerminalInputHandler extends AbstractTerminalInputHandler {
+ /**
+ * Construct a new instance with a ScreenBuffer instance.
+ *
+ * @param screenBuffer ScreenBuffer to use.
+ */
+ public LineTerminalInputHandler(ScreenBuffer screenBuffer) {
+ super(screenBuffer);
+ }
+}
\ No newline at end of file
Property changes on: trunk/mud4j-telnet/src/java/net/sf/mud4j/telnet/shell/LineTerminalInputHandler.java
___________________________________________________________________
Name: svn:keywords
+ "Author Date Id Revision"
Name: svn:eol-style
+ native
Modified: trunk/mud4j-telnet/src/java/net/sf/mud4j/telnet/shell/Mud4jTelnetLoginShell.java
===================================================================
--- trunk/mud4j-telnet/src/java/net/sf/mud4j/telnet/shell/Mud4jTelnetLoginShell.java 2007-10-03 04:46:38 UTC (rev 146)
+++ trunk/mud4j-telnet/src/java/net/sf/mud4j/telnet/shell/Mud4jTelnetLoginShell.java 2007-10-04 21:41:58 UTC (rev 147)
@@ -71,7 +71,7 @@
//getTerminalIO().write("Password read was: " + password);
if (username.equals("test") && password.equals("test")) {
getTerminalIO().write("Switching to editor...\n");
- connection.setNextShell("editor");
+ connection.setNextShell("prompt");
}
else {
getTerminalIO().write("Failed logon...Please try again.\n\r");
Added: trunk/mud4j-telnet/src/java/net/sf/mud4j/telnet/shell/Mud4jTelnetPromptShell.java
===================================================================
--- trunk/mud4j-telnet/src/java/net/sf/mud4j/telnet/shell/Mud4jTelnetPromptShell.java (rev 0)
+++ trunk/mud4j-telnet/src/java/net/sf/mud4j/telnet/shell/Mud4jTelnetPromptShell.java 2007-10-04 21:41:58 UTC (rev 147)
@@ -0,0 +1,113 @@
+/**
+ * Copyright 2006 Matthew Purland (m.p...@gm...)
+ *
+ * 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 net.sf.mud4j.telnet.shell;
+
+import java.io.IOException;
+
+/**
+ *
+ *
+ * @todo Auto-generated doc stub for Mud4jTelnetLoginShell.
+ *
+ * @author Matthew Purland
+ */
+public class Mud4jTelnetPromptShell extends AbstractTelnetShell implements
+ TelnetLoginShell {
+
+ /**
+ * {@inheritDoc}
+ */
+ public static TelnetShell createShell() {
+ return new Mud4jTelnetPromptShell();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getGreeting() {
+ /**
+ * @todo Auto-generated method stub
+ */
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void run() throws IOException {
+
+// // Initialize the shell
+// initialize();
+//
+// String command = null;
+// boolean promptHasExited = false;
+//
+// while (!promptHasExited) {
+// getTerminalIO().write("> ");
+// command = readWord(true);
+//
+// getTerminalIO().write("Command was: " + command + "\n\r");
+//
+// if ("quit".equals(command)) {
+// promptHasExited = true;
+// }
+// }
+
+ try {
+ terminalIO.setSignalling(true);
+
+ // Erase the screen and place home cursor at 0,0
+ terminalIO.eraseScreen();
+ terminalIO.homeCursor();
+
+ ScreenBuffer screenBuffer = new TerminalScreenBuffer(terminalIO, terminalIO.getColumns(), 1);
+ TerminalInputHandler inputHandler = new LineTerminalInputHandler(screenBuffer);
+
+ // Display the greeting
+ if (this instanceof TelnetLoginShell) {
+ TelnetLoginShell loginShell = (TelnetLoginShell) this;
+
+ // terminalIO.write(loginShell.getGreeting());
+ }
+ // terminalIO.write(BasicTerminalIO.CRLF);
+
+ // In order to keep current row we need to monitor
+ // each write to terminalIO.write to monitor
+ // for new lines and add 1 for each new line
+ // already sent
+ // As commented out as above for login shell to get working
+// int currentRow = 1;
+// int currentColumn = 1;
+// StringBuffer currentLineBuffer = new StringBuffer();
+// screenBuffer.put(Integer.valueOf(currentRow), currentLineBuffer);
+ boolean isInterrupted = false;
+
+ while (!isInterrupted) {
+ int input = terminalIO.read();
+
+ inputHandler.handleInput(input, terminalIO);
+ }
+
+ // Flush the output to ensure it is sent immediately
+ terminalIO.flush();
+ }
+ catch (IOException ex) {
+ // TODO need to redo to not squelch exceptions
+ }
+ }
+
+}
Property changes on: trunk/mud4j-telnet/src/java/net/sf/mud4j/telnet/shell/Mud4jTelnetPromptShell.java
___________________________________________________________________
Name: svn:keywords
+ "Author Date Id Revision"
Name: svn:eol-style
+ native
Modified: trunk/mud4j-telnet/src/java/net/sf/mud4j/telnet/shell/TerminalInputHandler.java
===================================================================
--- trunk/mud4j-telnet/src/java/net/sf/mud4j/telnet/shell/TerminalInputHandler.java 2007-10-03 04:46:38 UTC (rev 146)
+++ trunk/mud4j-telnet/src/java/net/sf/mud4j/telnet/shell/TerminalInputHandler.java 2007-10-04 21:41:58 UTC (rev 147)
@@ -24,6 +24,16 @@
*/
public interface TerminalInputHandler {
+ public enum TerminalKey {
+ UP,
+ DOWN,
+ LEFT,
+ RIGHT,
+ BACKSPACE,
+ DELETE,
+ ENTER
+ }
+
/**
* Input to be handled by the specified input handler. This may include
* operations on the given terminal.
Modified: trunk/mud4j-telnet/src/java/net/sf/mud4j/telnet/shell/TerminalScreenBuffer.java
===================================================================
--- trunk/mud4j-telnet/src/java/net/sf/mud4j/telnet/shell/TerminalScreenBuffer.java 2007-10-03 04:46:38 UTC (rev 146)
+++ trunk/mud4j-telnet/src/java/net/sf/mud4j/telnet/shell/TerminalScreenBuffer.java 2007-10-04 21:41:58 UTC (rev 147)
@@ -286,9 +286,13 @@
public void write(char character) {
super.write(character);
+ int xPos = getCursorPosition().x + 1;
+ int yPos = getCursorPosition().y;
+
try {
- terminalIO.write(character);
-
+ if (isValidPosition(xPos, yPos)) {
+ terminalIO.write(character);
+ }
System.out.println(character + " was read.");
}
catch (IOException ex) {
@@ -296,4 +300,14 @@
}
}
+ @Override
+ protected void setCursorPosition(int x, int y) {
+ int lastXPosition = getCursorPosition().x;
+ int lastYPosition = getCursorPosition().y;
+
+ super.setCursorPosition(x, y);
+
+ moveTerminalCursorToCurrentPosition(lastXPosition, lastYPosition);
+ }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mpu...@us...> - 2007-10-03 04:46:44
|
Revision: 146
http://mud4j.svn.sourceforge.net/mud4j/?rev=146&view=rev
Author: mpurland
Date: 2007-10-02 21:46:38 -0700 (Tue, 02 Oct 2007)
Log Message:
-----------
Fix maven configuration and eclipse project settings.
Modified Paths:
--------------
trunk/mud4j-core/.classpath
trunk/mud4j-core/.project
trunk/mud4j-core/pom.xml
trunk/mud4j-telnet/pom.xml
trunk/mud4j-web/.classpath
trunk/mud4j-web/.project
trunk/mud4j-web/pom.xml
Modified: trunk/mud4j-core/.classpath
===================================================================
--- trunk/mud4j-core/.classpath 2007-10-02 15:52:38 UTC (rev 145)
+++ trunk/mud4j-core/.classpath 2007-10-03 04:46:38 UTC (rev 146)
@@ -1,11 +1,25 @@
-<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/java"/>
- <classpathentry kind="src" path="src/test/unit"/>
- <classpathentry kind="src" path="src/test/db"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry combineaccessrules="false" kind="src" path="/jdaemon"/>
- <classpathentry kind="var" path="MAVEN_REPO/log4j/jars/log4j-1.2.13.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-4.1.jar"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+ <classpathentry kind="src" path="src/java"/>
+ <classpathentry kind="src" path="src/resources" excluding="**/*.java"/>
+ <classpathentry kind="src" path="src/test/unit" output="target/test-classes"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/4.1/junit-4.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/asm/asm/1.5.3/asm-1.5.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/2.1.1/commons-collections-2.1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring/2.0/spring-2.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/aspectj/aspectjtools/1.5.1a/aspectjtools-1.5.1a.jar"/>
+ <classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.2/ehcache-1.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.12/log4j-1.2.12.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/>
+ <classpathentry kind="var" path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.0/commons-lang-2.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.2.0.cr5/hibernate-3.2.0.cr5.jar"/>
+</classpath>
\ No newline at end of file
Modified: trunk/mud4j-core/.project
===================================================================
--- trunk/mud4j-core/.project 2007-10-02 15:52:38 UTC (rev 145)
+++ trunk/mud4j-core/.project 2007-10-03 04:46:38 UTC (rev 146)
@@ -1,17 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>mud4j-core</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+ <name>mud4j-core</name>
+ <comment>mud4j core library that other modules will use.</comment>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
\ No newline at end of file
Modified: trunk/mud4j-core/pom.xml
===================================================================
--- trunk/mud4j-core/pom.xml 2007-10-02 15:52:38 UTC (rev 145)
+++ trunk/mud4j-core/pom.xml 2007-10-03 04:46:38 UTC (rev 146)
@@ -3,6 +3,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
+ <relativePath>../mud4j</relativePath>
<groupId>net.sf.mud4j</groupId>
<artifactId>mud4j-master</artifactId>
<version>1.0-SNAPSHOT</version>
@@ -23,6 +24,11 @@
<artifactId>junit</artifactId>
<version>4.1</version>
</dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.12</version>
+ </dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
Modified: trunk/mud4j-telnet/pom.xml
===================================================================
--- trunk/mud4j-telnet/pom.xml 2007-10-02 15:52:38 UTC (rev 145)
+++ trunk/mud4j-telnet/pom.xml 2007-10-03 04:46:38 UTC (rev 146)
@@ -3,6 +3,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
+ <relativePath>../mud4j</relativePath>
<groupId>net.sf.mud4j</groupId>
<artifactId>mud4j-master</artifactId>
<version>1.0-SNAPSHOT</version>
Modified: trunk/mud4j-web/.classpath
===================================================================
--- trunk/mud4j-web/.classpath 2007-10-02 15:52:38 UTC (rev 145)
+++ trunk/mud4j-web/.classpath 2007-10-03 04:46:38 UTC (rev 146)
@@ -1,32 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/java"/>
- <classpathentry kind="src" path="src/test/unit"/>
- <classpathentry kind="src" path="src/test/functional"/>
- <classpathentry kind="src" path="src/webapp"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry combineaccessrules="false" kind="src" path="/mud4j-core"/>
- <classpathentry kind="var" path="MAVEN_REPO/org.mortbay.jetty/jars/jetty-6.1.0rc3.jar" sourcepath="/OPT_JAVA/jetty-6.1.0rc3-src.zip"/>
- <classpathentry kind="var" path="MAVEN_REPO/org.mortbay.jetty/jars/jetty-util-6.1.0rc3.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/commons-logging/jars/commons-logging-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/myfaces/core/myfaces-api/1.1.4/myfaces-api-1.1.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/myfaces/core/myfaces-impl/1.1.4/myfaces-impl-1.1.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-digester/commons-digester/1.8/commons-digester-1.8.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-el/commons-el/1.0/commons-el-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/servlet/jstl/1.1.0/jstl-1.1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jsp-api-2.1/6.1-SNAPSHOT/jsp-api-2.1-6.1-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jsp-2.1/6.1-SNAPSHOT/jsp-2.1-6.1-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/servlet-api-2.5/6.1-SNAPSHOT/servlet-api-2.5-6.1-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/myfaces/tomahawk/tomahawk/1.1.5-SNAPSHOT/tomahawk-1.1.5-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="M2_REPO/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-dbcp/commons-dbcp/1.2/commons-dbcp-1.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.3/commons-pool-1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6/dom4j-1.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.2.0.cr5/hibernate-3.2.0.cr5.jar"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+ <classpathentry kind="src" path="src/java"/>
+ <classpathentry kind="src" path="src/test" output="target/test-classes"/>
+ <classpathentry kind="src" path="src/functional" output="target/test-classes"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.3/commons-codec-1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jetty/6.1.0rc3/jetty-6.1.0rc3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/myfaces/shared/myfaces-shared-core/2.0.3/myfaces-shared-core-2.0.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.0/commons-lang-2.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/net/sf/mud4j/mud4j-core/1.0-SNAPSHOT/mud4j-core-1.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/servlet-api/2.5-6.0.1/servlet-api-2.5-6.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.0.2/xercesImpl-2.0.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.2.0.cr5/hibernate-3.2.0.cr5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.7.0/ant-1.7.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.2/ehcache-1.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.12/log4j-1.2.12.jar"/>
+ <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6/dom4j-1.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/myfaces/shared/myfaces-shared-tomahawk/2.0.3/myfaces-shared-tomahawk-2.0.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/asm/asm/1.5.3/asm-1.5.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.3/commons-pool-1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/springframework/spring/2.0/spring-2.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/2.1/commons-collections-2.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jetty-util/6.1.0rc3/jetty-util-6.1.0rc3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-digester/commons-digester/1.8/commons-digester-1.8.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/4.1/junit-4.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-el/commons-el/1.0/commons-el-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-dbcp/commons-dbcp/1.2/commons-dbcp-1.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/aspectj/aspectjtools/1.5.1a/aspectjtools-1.5.1a.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/myfaces/shared/myfaces-shared-impl/2.0.3/myfaces-shared-impl-2.0.3.jar"/>
+</classpath>
\ No newline at end of file
Modified: trunk/mud4j-web/.project
===================================================================
--- trunk/mud4j-web/.project 2007-10-02 15:52:38 UTC (rev 145)
+++ trunk/mud4j-web/.project 2007-10-03 04:46:38 UTC (rev 146)
@@ -1,24 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>mud4j-web</name>
- <comment></comment>
- <projects>
- <project>mud4j-core</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>tk.eclipse.plugin.jsf.JSFProjectBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>tk.eclipse.plugin.jsf.JSFProjectNature</nature>
- </natures>
-</projectDescription>
+ <name>mud4j-web</name>
+ <comment>An extension of the core framework to provide web presence such to various
+ view technologies through servlets and embedded solutions.</comment>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>tk.eclipse.plugin.jsf.JSFProjectBuilder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>tk.eclipse.plugin.jsf.JSFProjectNature</nature>
+ </natures>
+</projectDescription>
\ No newline at end of file
Modified: trunk/mud4j-web/pom.xml
===================================================================
--- trunk/mud4j-web/pom.xml 2007-10-02 15:52:38 UTC (rev 145)
+++ trunk/mud4j-web/pom.xml 2007-10-03 04:46:38 UTC (rev 146)
@@ -3,6 +3,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
+ <relativePath>../mud4j</relativePath>
<groupId>net.sf.mud4j</groupId>
<artifactId>mud4j-master</artifactId>
<version>1.0-SNAPSHOT</version>
@@ -25,12 +26,22 @@
<version>4.1</version>
</dependency>
<dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.12</version>
+ </dependency>
+
+ <dependency>
<groupId>net.sf.mud4j</groupId>
<artifactId>mud4j-core</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
-
<dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mpu...@us...> - 2007-10-02 15:52:41
|
Revision: 145
http://mud4j.svn.sourceforge.net/mud4j/?rev=145&view=rev
Author: mpurland
Date: 2007-10-02 08:52:38 -0700 (Tue, 02 Oct 2007)
Log Message:
-----------
Refactor usage of Area to Zone
Modified Paths:
--------------
trunk/mud4j-core/src/java/net/sf/mud4j/world/AbstractWorld.java
trunk/mud4j-core/src/java/net/sf/mud4j/world/World.java
Added Paths:
-----------
trunk/mud4j-core/src/java/net/sf/mud4j/world/zone/AbstractZone.java
trunk/mud4j-core/src/java/net/sf/mud4j/world/zone/Zone.java
trunk/mud4j-core/src/java/net/sf/mud4j/world/zone/convert/Rom24ZoneConverter.java
trunk/mud4j-core/src/java/net/sf/mud4j/world/zone/convert/ZoneConverter.java
Removed Paths:
-------------
trunk/mud4j-core/src/java/net/sf/mud4j/world/zone/AbstractArea.java
trunk/mud4j-core/src/java/net/sf/mud4j/world/zone/Area.java
trunk/mud4j-core/src/java/net/sf/mud4j/world/zone/convert/AreaConverter.java
trunk/mud4j-core/src/java/net/sf/mud4j/world/zone/convert/Rom24AreaConverter.java
Modified: trunk/mud4j-core/src/java/net/sf/mud4j/world/AbstractWorld.java
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/world/AbstractWorld.java 2007-10-02 15:43:24 UTC (rev 144)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/world/AbstractWorld.java 2007-10-02 15:52:38 UTC (rev 145)
@@ -18,7 +18,7 @@
import java.util.List;
-import net.sf.mud4j.world.area.Area;
+import net.sf.mud4j.world.zone.Zone;
/**
* Abstract implementation for a world.
@@ -27,8 +27,8 @@
*/
public class AbstractWorld implements World {
- // List of areas in the world
- private List<Area> areaList;
+ // List of zones in the world
+ private List<Zone> zoneList;
// List of characters in the world
private List<Character> characterList;
@@ -36,8 +36,8 @@
/**
* {@inheritDoc}s
*/
- public List<Area> getAreas() {
- return areaList;
+ public List<Zone> getZones() {
+ return zoneList;
}
/**
Modified: trunk/mud4j-core/src/java/net/sf/mud4j/world/World.java
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/world/World.java 2007-10-02 15:43:24 UTC (rev 144)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/world/World.java 2007-10-02 15:52:38 UTC (rev 145)
@@ -18,7 +18,7 @@
import java.util.List;
-import net.sf.mud4j.world.area.Area;
+import net.sf.mud4j.world.zone.Zone;
/**
* World interface for defining world types.
@@ -27,10 +27,10 @@
*/
public interface World {
/**
- * Get list of areas.
- * @return Return list of areas.
+ * Get list of zones.
+ * @return Return list of zones.
*/
- public List<Area> getAreas();
+ public List<Zone> getZones();
/**
* Get list of characters in the world.
Deleted: trunk/mud4j-core/src/java/net/sf/mud4j/world/zone/AbstractArea.java
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/world/zone/AbstractArea.java 2007-10-02 15:43:24 UTC (rev 144)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/world/zone/AbstractArea.java 2007-10-02 15:52:38 UTC (rev 145)
@@ -1,75 +0,0 @@
-/**
- * Copyright 2006 Matthew Purland (m.p...@gm...)
- *
- * 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 net.sf.mud4j.world.area;
-
-import java.util.List;
-
-import net.sf.mud4j.character.Character;
-import net.sf.mud4j.world.Room;
-import net.sf.mud4j.world.item.Item;
-
-/**
- * Abstract implementation of areas.
- *
- * @author Matthew Purland
- */
-public class AbstractArea implements Area {
-
- // Name of the area
- private String areaName;
-
- /**
- * Constructs a new area with the specified area name.
- *
- * @param areaName Name of the area.
- */
- public AbstractArea(String areaName) {
- this.areaName = areaName;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getAreaName() {
- return areaName;
- }
-
- /**
- * {@inheritDoc}
- */
- public List<Character> getCharacters() {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public List<Item> getItems() {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public List<Room> getRooms() {
- // TODO Auto-generated method stub
- return null;
- }
-
-}
Copied: trunk/mud4j-core/src/java/net/sf/mud4j/world/zone/AbstractZone.java (from rev 144, trunk/mud4j-core/src/java/net/sf/mud4j/world/zone/AbstractArea.java)
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/world/zone/AbstractZone.java (rev 0)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/world/zone/AbstractZone.java 2007-10-02 15:52:38 UTC (rev 145)
@@ -0,0 +1,75 @@
+/**
+ * Copyright 2006 Matthew Purland (m.p...@gm...)
+ *
+ * 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 net.sf.mud4j.world.zone;
+
+import java.util.List;
+
+import net.sf.mud4j.character.Character;
+import net.sf.mud4j.world.Room;
+import net.sf.mud4j.world.item.Item;
+
+/**
+ * Abstract implementation of areas.
+ *
+ * @author Matthew Purland
+ */
+public class AbstractZone implements Zone {
+
+ // Name of the area
+ private String areaName;
+
+ /**
+ * Constructs a new area with the specified area name.
+ *
+ * @param areaName Name of the area.
+ */
+ public AbstractZone(String areaName) {
+ this.areaName = areaName;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getAreaName() {
+ return areaName;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public List<Character> getCharacters() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public List<Item> getItems() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public List<Room> getRooms() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+}
Deleted: trunk/mud4j-core/src/java/net/sf/mud4j/world/zone/Area.java
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/world/zone/Area.java 2007-10-02 15:43:24 UTC (rev 144)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/world/zone/Area.java 2007-10-02 15:52:38 UTC (rev 145)
@@ -1,60 +0,0 @@
-/**
- * Copyright 2006 Matthew Purland (m.p...@gm...)
- *
- * 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 net.sf.mud4j.world.area;
-
-import java.util.List;
-
-import net.sf.mud4j.character.Character;
-import net.sf.mud4j.world.Room;
-import net.sf.mud4j.world.item.Item;
-
-/**
- * Area interface for different types of areas.
- *
- * @author Matthew Purland
- */
-public interface Area {
-
- /**
- * Get name of the area.
- *
- * @return Get name of the area.
- */
- public String getAreaName();
-
- /**
- * Retrieve list of rooms contained in the area.
- *
- * @return Returns a list of rooms in the area.
- */
- public List<Room> getRooms();
-
- /**
- * Retrieve list of players contained in the area.
- *
- * @return Returns a list of characters in the area.
- */
- public List<Character> getCharacters();
-
- /**
- * Retrieve list of items contained in area.
- *
- * @return Returns a list of items in the area.
- */
- public List<Item> getItems();
-
-}
Copied: trunk/mud4j-core/src/java/net/sf/mud4j/world/zone/Zone.java (from rev 144, trunk/mud4j-core/src/java/net/sf/mud4j/world/zone/Area.java)
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/world/zone/Zone.java (rev 0)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/world/zone/Zone.java 2007-10-02 15:52:38 UTC (rev 145)
@@ -0,0 +1,60 @@
+/**
+ * Copyright 2006 Matthew Purland (m.p...@gm...)
+ *
+ * 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 net.sf.mud4j.world.zone;
+
+import java.util.List;
+
+import net.sf.mud4j.character.Character;
+import net.sf.mud4j.world.Room;
+import net.sf.mud4j.world.item.Item;
+
+/**
+ * Area interface for different types of areas.
+ *
+ * @author Matthew Purland
+ */
+public interface Zone {
+
+ /**
+ * Get name of the area.
+ *
+ * @return Get name of the area.
+ */
+ public String getAreaName();
+
+ /**
+ * Retrieve list of rooms contained in the area.
+ *
+ * @return Returns a list of rooms in the area.
+ */
+ public List<Room> getRooms();
+
+ /**
+ * Retrieve list of players contained in the area.
+ *
+ * @return Returns a list of characters in the area.
+ */
+ public List<Character> getCharacters();
+
+ /**
+ * Retrieve list of items contained in area.
+ *
+ * @return Returns a list of items in the area.
+ */
+ public List<Item> getItems();
+
+}
Deleted: trunk/mud4j-core/src/java/net/sf/mud4j/world/zone/convert/AreaConverter.java
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/world/zone/convert/AreaConverter.java 2007-10-02 15:43:24 UTC (rev 144)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/world/zone/convert/AreaConverter.java 2007-10-02 15:52:38 UTC (rev 145)
@@ -1,29 +0,0 @@
-/**
- * Copyright 2006 Matthew Purland (m.p...@gm...)
- *
- * 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 net.sf.mud4j.world.area.convert;
-
-/**
- * Area converter interface to define a set of area
- * converters from different types of games with
- * areas already defined.
- *
- * @author Matthew Purland
- *
- */
-public interface AreaConverter {
-
-}
Deleted: trunk/mud4j-core/src/java/net/sf/mud4j/world/zone/convert/Rom24AreaConverter.java
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/world/zone/convert/Rom24AreaConverter.java 2007-10-02 15:43:24 UTC (rev 144)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/world/zone/convert/Rom24AreaConverter.java 2007-10-02 15:52:38 UTC (rev 145)
@@ -1,26 +0,0 @@
-/**
- * Copyright 2006 Matthew Purland (m.p...@gm...)
- *
- * 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 net.sf.mud4j.world.area.convert;
-
-/**
- * Area converter to convert areas from Rom24 area format to import directly
- * into mud4j equivalent classes.
- *
- * @author Matthew Purland
- */
-public class Rom24AreaConverter {
-
-}
Copied: trunk/mud4j-core/src/java/net/sf/mud4j/world/zone/convert/Rom24ZoneConverter.java (from rev 144, trunk/mud4j-core/src/java/net/sf/mud4j/world/zone/convert/Rom24AreaConverter.java)
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/world/zone/convert/Rom24ZoneConverter.java (rev 0)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/world/zone/convert/Rom24ZoneConverter.java 2007-10-02 15:52:38 UTC (rev 145)
@@ -0,0 +1,26 @@
+/**
+ * Copyright 2006 Matthew Purland (m.p...@gm...)
+ *
+ * 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 net.sf.mud4j.world.zone.convert;
+
+/**
+ * Area converter to convert areas from Rom24 area format to import directly
+ * into mud4j equivalent classes.
+ *
+ * @author Matthew Purland
+ */
+public class Rom24ZoneConverter {
+
+}
Copied: trunk/mud4j-core/src/java/net/sf/mud4j/world/zone/convert/ZoneConverter.java (from rev 144, trunk/mud4j-core/src/java/net/sf/mud4j/world/zone/convert/AreaConverter.java)
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/world/zone/convert/ZoneConverter.java (rev 0)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/world/zone/convert/ZoneConverter.java 2007-10-02 15:52:38 UTC (rev 145)
@@ -0,0 +1,29 @@
+/**
+ * Copyright 2006 Matthew Purland (m.p...@gm...)
+ *
+ * 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 net.sf.mud4j.world.zone.convert;
+
+/**
+ * Area converter interface to define a set of area
+ * converters from different types of games with
+ * areas already defined.
+ *
+ * @author Matthew Purland
+ *
+ */
+public interface ZoneConverter {
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mpu...@us...> - 2007-10-02 15:43:25
|
Revision: 144
http://mud4j.svn.sourceforge.net/mud4j/?rev=144&view=rev
Author: mpurland
Date: 2007-10-02 08:43:24 -0700 (Tue, 02 Oct 2007)
Log Message:
-----------
Remove area.
Removed Paths:
-------------
trunk/mud4j-core/src/java/net/sf/mud4j/world/area/convert/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mpu...@us...> - 2007-10-02 15:43:23
|
Revision: 143
http://mud4j.svn.sourceforge.net/mud4j/?rev=143&view=rev
Author: mpurland
Date: 2007-10-02 08:43:21 -0700 (Tue, 02 Oct 2007)
Log Message:
-----------
Remove area.
Removed Paths:
-------------
trunk/mud4j-core/src/java/net/sf/mud4j/world/area/AbstractArea.java
trunk/mud4j-core/src/java/net/sf/mud4j/world/area/Area.java
trunk/mud4j-core/src/java/net/sf/mud4j/world/area/package.html
Deleted: trunk/mud4j-core/src/java/net/sf/mud4j/world/area/AbstractArea.java
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/world/area/AbstractArea.java 2007-10-02 15:32:55 UTC (rev 142)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/world/area/AbstractArea.java 2007-10-02 15:43:21 UTC (rev 143)
@@ -1,75 +0,0 @@
-/**
- * Copyright 2006 Matthew Purland (m.p...@gm...)
- *
- * 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 net.sf.mud4j.world.area;
-
-import java.util.List;
-
-import net.sf.mud4j.character.Character;
-import net.sf.mud4j.world.Room;
-import net.sf.mud4j.world.item.Item;
-
-/**
- * Abstract implementation of areas.
- *
- * @author Matthew Purland
- */
-public class AbstractArea implements Area {
-
- // Name of the area
- private String areaName;
-
- /**
- * Constructs a new area with the specified area name.
- *
- * @param areaName Name of the area.
- */
- public AbstractArea(String areaName) {
- this.areaName = areaName;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getAreaName() {
- return areaName;
- }
-
- /**
- * {@inheritDoc}
- */
- public List<Character> getCharacters() {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public List<Item> getItems() {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public List<Room> getRooms() {
- // TODO Auto-generated method stub
- return null;
- }
-
-}
Deleted: trunk/mud4j-core/src/java/net/sf/mud4j/world/area/Area.java
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/world/area/Area.java 2007-10-02 15:32:55 UTC (rev 142)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/world/area/Area.java 2007-10-02 15:43:21 UTC (rev 143)
@@ -1,60 +0,0 @@
-/**
- * Copyright 2006 Matthew Purland (m.p...@gm...)
- *
- * 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 net.sf.mud4j.world.area;
-
-import java.util.List;
-
-import net.sf.mud4j.character.Character;
-import net.sf.mud4j.world.Room;
-import net.sf.mud4j.world.item.Item;
-
-/**
- * Area interface for different types of areas.
- *
- * @author Matthew Purland
- */
-public interface Area {
-
- /**
- * Get name of the area.
- *
- * @return Get name of the area.
- */
- public String getAreaName();
-
- /**
- * Retrieve list of rooms contained in the area.
- *
- * @return Returns a list of rooms in the area.
- */
- public List<Room> getRooms();
-
- /**
- * Retrieve list of players contained in the area.
- *
- * @return Returns a list of characters in the area.
- */
- public List<Character> getCharacters();
-
- /**
- * Retrieve list of items contained in area.
- *
- * @return Returns a list of items in the area.
- */
- public List<Item> getItems();
-
-}
Deleted: trunk/mud4j-core/src/java/net/sf/mud4j/world/area/package.html
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/world/area/package.html 2007-10-02 15:32:55 UTC (rev 142)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/world/area/package.html 2007-10-02 15:43:21 UTC (rev 143)
@@ -1,25 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-<!--
- Copyright 2006 Matthew Purland (m.p...@gm...)
-
- 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.
--->
-</head>
-<body>
- <p>
- Provides classes for areas and zones that can contain groups of locations.
- </p>
-</body>
-</html>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mpu...@us...> - 2007-10-02 15:32:57
|
Revision: 142
http://mud4j.svn.sourceforge.net/mud4j/?rev=142&view=rev
Author: mpurland
Date: 2007-10-02 08:32:55 -0700 (Tue, 02 Oct 2007)
Log Message:
-----------
Refactor area to zone.
Added Paths:
-----------
trunk/mud4j-core/src/java/net/sf/mud4j/world/zone/
Copied: trunk/mud4j-core/src/java/net/sf/mud4j/world/zone (from rev 141, trunk/mud4j-core/src/java/net/sf/mud4j/world/area)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mpu...@us...> - 2007-09-29 21:56:21
|
Revision: 141
http://mud4j.svn.sourceforge.net/mud4j/?rev=141&view=rev
Author: mpurland
Date: 2007-09-29 14:56:16 -0700 (Sat, 29 Sep 2007)
Log Message:
-----------
Update with login and logout controllers
Modified Paths:
--------------
trunk/mud4j-web/.classpath
trunk/mud4j-web/.project
trunk/mud4j-web/pom.xml
trunk/mud4j-web/src/java/net/sf/mud4j/web/Mud4jServer.java
trunk/mud4j-web/src/java/net/sf/mud4j/web/UserSession.java
trunk/mud4j-web/src/site/xdoc/ideas.xml
trunk/mud4j-web/src/webapp/WEB-INF/faces-config.xml
trunk/mud4j-web/src/webapp/WEB-INF/spring-config.xml
trunk/mud4j-web/src/webapp/WEB-INF/web.xml
Added Paths:
-----------
trunk/mud4j-web/resources/hsqldb/
trunk/mud4j-web/resources/hsqldb/data.log
trunk/mud4j-web/resources/hsqldb/data.properties
trunk/mud4j-web/resources/hsqldb/data.script
trunk/mud4j-web/src/java/net/sf/mud4j/web/controller/
trunk/mud4j-web/src/java/net/sf/mud4j/web/controller/LoginController.java
trunk/mud4j-web/src/java/net/sf/mud4j/web/controller/LogoutController.java
trunk/mud4j-web/src/test/functional/net/sf/mud4j/web/WebFunctionalTestSuite.java
trunk/mud4j-web/src/webapp/login.jsp
Removed Paths:
-------------
trunk/mud4j-web/src/java/net/sf/mud4j/web/LoginController.java
trunk/mud4j-web/src/java/net/sf/mud4j/web/LogoutController.java
trunk/mud4j-web/src/webapp/hello.jsp
trunk/mud4j-web/src/webapp/index.jsp
Modified: trunk/mud4j-web/.classpath
===================================================================
--- trunk/mud4j-web/.classpath 2007-09-29 21:42:59 UTC (rev 140)
+++ trunk/mud4j-web/.classpath 2007-09-29 21:56:16 UTC (rev 141)
@@ -3,6 +3,7 @@
<classpathentry kind="src" path="src/java"/>
<classpathentry kind="src" path="src/test/unit"/>
<classpathentry kind="src" path="src/test/functional"/>
+ <classpathentry kind="src" path="src/webapp"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/mud4j-core"/>
<classpathentry kind="var" path="MAVEN_REPO/org.mortbay.jetty/jars/jetty-6.1.0rc3.jar" sourcepath="/OPT_JAVA/jetty-6.1.0rc3-src.zip"/>
@@ -20,5 +21,12 @@
<classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/servlet-api-2.5/6.1-SNAPSHOT/servlet-api-2.5-6.1-SNAPSHOT.jar"/>
<classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.1/commons-lang-2.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/myfaces/tomahawk/tomahawk/1.1.5-SNAPSHOT/tomahawk-1.1.5-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/hsqldb/hsqldb/1.8.0.7/hsqldb-1.8.0.7.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-dbcp/commons-dbcp/1.2/commons-dbcp-1.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.3/commons-pool-1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6/dom4j-1.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.2.0.cr5/hibernate-3.2.0.cr5.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: trunk/mud4j-web/.project
===================================================================
--- trunk/mud4j-web/.project 2007-09-29 21:42:59 UTC (rev 140)
+++ trunk/mud4j-web/.project 2007-09-29 21:56:16 UTC (rev 141)
@@ -3,6 +3,7 @@
<name>mud4j-web</name>
<comment></comment>
<projects>
+ <project>mud4j-core</project>
</projects>
<buildSpec>
<buildCommand>
@@ -10,8 +11,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>tk.eclipse.plugin.jsf.JSFProjectBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>tk.eclipse.plugin.jsf.JSFProjectNature</nature>
</natures>
</projectDescription>
Modified: trunk/mud4j-web/pom.xml
===================================================================
--- trunk/mud4j-web/pom.xml 2007-09-29 21:42:59 UTC (rev 140)
+++ trunk/mud4j-web/pom.xml 2007-09-29 21:56:16 UTC (rev 141)
@@ -81,6 +81,26 @@
<artifactId>commons-digester</artifactId>
<version>1.8</version>
</dependency>
+ <dependency>
+ <groupId>commons-dbcp</groupId>
+ <artifactId>commons-dbcp</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.7</version>
+ </dependency>
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6</version>
+ </dependency>
</dependencies>
<build>
Added: trunk/mud4j-web/resources/hsqldb/data.log
===================================================================
--- trunk/mud4j-web/resources/hsqldb/data.log (rev 0)
+++ trunk/mud4j-web/resources/hsqldb/data.log 2007-09-29 21:56:16 UTC (rev 141)
@@ -0,0 +1,5 @@
+/*C1*/SET SCHEMA PUBLIC
+CONNECT USER SA
+DISCONNECT
+/*C2*/SET SCHEMA PUBLIC
+CONNECT USER SA
Added: trunk/mud4j-web/resources/hsqldb/data.properties
===================================================================
--- trunk/mud4j-web/resources/hsqldb/data.properties (rev 0)
+++ trunk/mud4j-web/resources/hsqldb/data.properties 2007-09-29 21:56:16 UTC (rev 141)
@@ -0,0 +1,17 @@
+#HSQL Database Engine 1.8.0.5
+#Sat Jun 23 16:24:40 CDT 2007
+hsqldb.script_format=0
+runtime.gc_interval=0
+sql.enforce_strict_size=false
+hsqldb.cache_size_scale=8
+readonly=false
+hsqldb.nio_data_file=true
+hsqldb.cache_scale=14
+version=1.8.0
+hsqldb.default_table_type=memory
+hsqldb.cache_file_scale=1
+hsqldb.log_size=200
+modified=yes
+hsqldb.cache_version=1.7.0
+hsqldb.original_version=1.8.0
+hsqldb.compatible_version=1.8.0
Added: trunk/mud4j-web/resources/hsqldb/data.script
===================================================================
--- trunk/mud4j-web/resources/hsqldb/data.script (rev 0)
+++ trunk/mud4j-web/resources/hsqldb/data.script 2007-09-29 21:56:16 UTC (rev 141)
@@ -0,0 +1,4 @@
+CREATE SCHEMA PUBLIC AUTHORIZATION DBA
+CREATE USER SA PASSWORD ""
+GRANT DBA TO SA
+SET WRITE_DELAY 10
Deleted: trunk/mud4j-web/src/java/net/sf/mud4j/web/LoginController.java
===================================================================
--- trunk/mud4j-web/src/java/net/sf/mud4j/web/LoginController.java 2007-09-29 21:42:59 UTC (rev 140)
+++ trunk/mud4j-web/src/java/net/sf/mud4j/web/LoginController.java 2007-09-29 21:56:16 UTC (rev 141)
@@ -1,55 +0,0 @@
-/**
- * Copyright 2006 Matthew Purland (m.p...@gm...)
- *
- * 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 net.sf.mud4j.web;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import net.sf.mud4j.account.Account;
-
-import org.springframework.web.servlet.ModelAndView;
-import org.springframework.web.servlet.mvc.Controller;
-
-/**
- * Login controller to handle incoming login requests.
- *
- * @author Matthew Purland
- */
-public class LoginController implements Controller {
-
- /**
- * {@inheritDoc}
- */
- public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response) throws Exception {
- String username = request.getParameter("username");
- String password = request.getParameter("password");
-
- return null;
-
-// if (account == null) {
-// return new ModelAndView("Error", "message",
-// "Invalid username or password. Login failed." );
-// }
-// else {
-// UserSession session = new UserSession(account);
-//
-// request.getSession().setAttribute("userSession", session);
-//
-// return new ModelAndView("index");
-// }
- }
-
-}
Deleted: trunk/mud4j-web/src/java/net/sf/mud4j/web/LogoutController.java
===================================================================
--- trunk/mud4j-web/src/java/net/sf/mud4j/web/LogoutController.java 2007-09-29 21:42:59 UTC (rev 140)
+++ trunk/mud4j-web/src/java/net/sf/mud4j/web/LogoutController.java 2007-09-29 21:56:16 UTC (rev 141)
@@ -1,44 +0,0 @@
-/**
- * Copyright 2006 Matthew Purland (m.p...@gm...)
- *
- * 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 net.sf.mud4j.web;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.web.servlet.ModelAndView;
-import org.springframework.web.servlet.mvc.Controller;
-
-/**
- * Controller to control logging out and ending a user session.
- *
- * @author Matthew Purland
- */
-public class LogoutController implements Controller {
-
- /**
- * {@inheritDoc}
- */
- public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response) throws Exception {
- UserSession session = (UserSession) request.getAttribute("userSession");
-
- if (session != null) {
-
- }
-
- return null;
- }
-
-}
Modified: trunk/mud4j-web/src/java/net/sf/mud4j/web/Mud4jServer.java
===================================================================
--- trunk/mud4j-web/src/java/net/sf/mud4j/web/Mud4jServer.java 2007-09-29 21:42:59 UTC (rev 140)
+++ trunk/mud4j-web/src/java/net/sf/mud4j/web/Mud4jServer.java 2007-09-29 21:56:16 UTC (rev 141)
@@ -45,7 +45,7 @@
webServer.start();
}
catch (IOException e) {
- System.out.println(e);
+ System.err.println(e);
}
}
}
Modified: trunk/mud4j-web/src/java/net/sf/mud4j/web/UserSession.java
===================================================================
--- trunk/mud4j-web/src/java/net/sf/mud4j/web/UserSession.java 2007-09-29 21:42:59 UTC (rev 140)
+++ trunk/mud4j-web/src/java/net/sf/mud4j/web/UserSession.java 2007-09-29 21:56:16 UTC (rev 141)
@@ -39,7 +39,7 @@
}
/**
- * Get the account.
+ * Get the account that owns the session.
*
* @return the account.
*/
Copied: trunk/mud4j-web/src/java/net/sf/mud4j/web/controller/LoginController.java (from rev 117, trunk/mud4j-web/src/java/net/sf/mud4j/web/LoginController.java)
===================================================================
--- trunk/mud4j-web/src/java/net/sf/mud4j/web/controller/LoginController.java (rev 0)
+++ trunk/mud4j-web/src/java/net/sf/mud4j/web/controller/LoginController.java 2007-09-29 21:56:16 UTC (rev 141)
@@ -0,0 +1,92 @@
+/**
+ * Copyright 2006 Matthew Purland (m.p...@gm...)
+ *
+ * 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 net.sf.mud4j.web.controller;
+
+import org.springframework.dao.DataAccessException;
+
+import net.sf.mud4j.dao.AccountDao;
+
+/**
+ * Login controller to handle incoming login requests.
+ *
+ * @author Matthew Purland
+ */
+public class LoginController {
+ // Username for the login
+ private String username;
+ // Password for the login
+ private String password;
+
+ // Account dao for verifying login
+ private AccountDao accountDao;
+
+ public LoginController(AccountDao accountDao) {
+ this.accountDao = accountDao;
+ }
+
+ /**
+ * Verify login to the delegated account.
+ * @return
+ */
+ public String verifyLogin() {
+ try {
+ //accountDao.loadAccount(username, password);
+ }
+ catch (DataAccessException e) {
+ return "failure";
+ }
+
+ return "success";
+ }
+
+
+ /**
+ * Get the username.
+ *
+ * @return the username.
+ */
+ public String getUsername() {
+ return this.username;
+ }
+
+
+ /**
+ * Set the username.
+ *
+ * @param username the username to set.
+ */
+ public void setUsername(String username) {
+ this.username = username;
+ }
+
+ /**
+ * Get the password.
+ *
+ * @return the password.
+ */
+ public String getPassword() {
+ return this.password;
+ }
+
+ /**
+ * Set the password.
+ *
+ * @param password the password to set.
+ */
+ public void setPassword(String password) {
+ this.password = password;
+ }
+}
Copied: trunk/mud4j-web/src/java/net/sf/mud4j/web/controller/LogoutController.java (from rev 117, trunk/mud4j-web/src/java/net/sf/mud4j/web/LogoutController.java)
===================================================================
--- trunk/mud4j-web/src/java/net/sf/mud4j/web/controller/LogoutController.java (rev 0)
+++ trunk/mud4j-web/src/java/net/sf/mud4j/web/controller/LogoutController.java 2007-09-29 21:56:16 UTC (rev 141)
@@ -0,0 +1,46 @@
+/**
+ * Copyright 2006 Matthew Purland (m.p...@gm...)
+ *
+ * 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 net.sf.mud4j.web.controller;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import net.sf.mud4j.web.UserSession;
+
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.mvc.Controller;
+
+/**
+ * Controller to control logging out and ending a user session.
+ *
+ * @author Matthew Purland
+ */
+public class LogoutController implements Controller {
+
+ /**
+ * {@inheritDoc}
+ */
+ public ModelAndView handleRequest(HttpServletRequest request, HttpServletResponse response) throws Exception {
+ UserSession session = (UserSession) request.getAttribute("userSession");
+
+ if (session != null) {
+
+ }
+
+ return null;
+ }
+
+}
Modified: trunk/mud4j-web/src/site/xdoc/ideas.xml
===================================================================
--- trunk/mud4j-web/src/site/xdoc/ideas.xml 2007-09-29 21:42:59 UTC (rev 140)
+++ trunk/mud4j-web/src/site/xdoc/ideas.xml 2007-09-29 21:56:16 UTC (rev 141)
@@ -23,6 +23,8 @@
the form of JSF components</li>
<li>Will provide functional testing of mud4j-web through
Selenium tests.</li>
+
+ <li>Use Jabber HTTP bindings for separate method for connection to server</li>
</ul>
</body>
</document>
\ No newline at end of file
Added: trunk/mud4j-web/src/test/functional/net/sf/mud4j/web/WebFunctionalTestSuite.java
===================================================================
--- trunk/mud4j-web/src/test/functional/net/sf/mud4j/web/WebFunctionalTestSuite.java (rev 0)
+++ trunk/mud4j-web/src/test/functional/net/sf/mud4j/web/WebFunctionalTestSuite.java 2007-09-29 21:56:16 UTC (rev 141)
@@ -0,0 +1,23 @@
+/**
+ * Copyright 2006 Matthew Purland (m.p...@gm...)
+ *
+ * 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 net.sf.mud4j.web;
+
+/**
+ * Web functional test suite using SRC.
+ */
+public class WebFunctionalTestSuite {
+
+}
Modified: trunk/mud4j-web/src/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/mud4j-web/src/webapp/WEB-INF/faces-config.xml 2007-09-29 21:42:59 UTC (rev 140)
+++ trunk/mud4j-web/src/webapp/WEB-INF/faces-config.xml 2007-09-29 21:56:16 UTC (rev 141)
@@ -5,13 +5,29 @@
"http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
<!-- JSF Myfaces configuration -->
<faces-config>
+
+ <application>
+ <variable-resolver>
+ org.springframework.web.jsf.DelegatingVariableResolver
+ </variable-resolver>
+ </application>
+
+
+<!--
+<managed-bean>
+ <description>Login controller</description>
+ <managed-bean-name>login</managed-bean-name>
+ <managed-bean-class>net.sf.mud4j.web.controller.LoginController</managed-bean-class>
+ <managed-bean-scope>application</managed-bean-scope>
+</managed-bean>
+-->
+
<navigation-rule>
- <from-view-id>/index.jsp</from-view-id>
+ <from-view-id>/login.jsp</from-view-id>
<navigation-case>
<from-outcome>login</from-outcome>
- <to-view-id>/hello.jsp</to-view-id>
+ <to-view-id>/login.jsp</to-view-id>
</navigation-case>
-
</navigation-rule>
</faces-config>
\ No newline at end of file
Modified: trunk/mud4j-web/src/webapp/WEB-INF/spring-config.xml
===================================================================
--- trunk/mud4j-web/src/webapp/WEB-INF/spring-config.xml 2007-09-29 21:42:59 UTC (rev 140)
+++ trunk/mud4j-web/src/webapp/WEB-INF/spring-config.xml 2007-09-29 21:56:16 UTC (rev 141)
@@ -1,11 +1,68 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- mud4j spring configuration -->
<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:util="http://www.springframework.org/schema/util"
- xmlns:aop="http://www.springframework.org/schema/aop"
- xsi:schemaLocation="
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:aop="http://www.springframework.org/schema/aop"
+ xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+ <!-- DataSource Property -->
+ <bean id="hsqlDataSource" class="org.apache.commons.dbcp.BasicDataSource">
+ <property name="driverClassName">
+ <value>org.hsqldb.jdbcDriver</value>
+ </property>
+ <property name="url">
+ <value>jdbc:hsqldb:file:resources/hsqldb/data</value>
+ </property>
+ <property name="username">
+ <value>sa</value>
+ </property>
+ <property name="password">
+ <value></value>
+ </property>
+ </bean>
+
+ <!-- Database Property -->
+ <bean id="hsqlHibernateProperties"
+ class="org.springframework.beans.factory.config.PropertiesFactoryBean">
+ <property name="properties">
+ <props>
+ <prop key="hibernate.hbm2ddl.auto">update</prop>
+ <prop key="hibernate.dialect">
+ org.hibernate.dialect.HSQLDialect</prop>
+ <prop key="hibernate.query.substitutions">true 'T', false 'F'</prop>
+ <prop key="hibernate.show_sql">false</prop>
+ <prop key="hibernate.c3p0.minPoolSize">5</prop>
+ <prop key="hibernate.c3p0.maxPoolSize">20</prop>
+ <prop key="hibernate.c3p0.timeout">600</prop>
+ <prop key="hibernate.c3p0.max_statement">50</prop>
+ <prop key="hibernate.c3p0.testConnectionOnCheckout">false</prop>
+ </props>
+ </property>
+ </bean>
+
+ <!-- Hibernate SessionFactory -->
+ <bean id="hibernateSessionFactory"
+ class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
+ <property name="dataSource">
+ <ref local="hsqlDataSource"/>
+ </property>
+ <property name="hibernateProperties">
+ <ref bean="hsqlHibernateProperties"/>
+ </property>
+
+ </bean>
+
+ <bean name="accountDao"
+ class="net.sf.mud4j.dao.hibernate.AccountDaoHibernate">
+ <property name="sessionFactory" ref="hibernateSessionFactory"/>
+ </bean>
+
+ <bean name="login" class="net.sf.mud4j.web.controller.LoginController">
+ <constructor-arg>
+ <ref bean="accountDao"/>
+ </constructor-arg>
+ </bean>
</beans>
\ No newline at end of file
Modified: trunk/mud4j-web/src/webapp/WEB-INF/web.xml
===================================================================
--- trunk/mud4j-web/src/webapp/WEB-INF/web.xml 2007-09-29 21:42:59 UTC (rev 140)
+++ trunk/mud4j-web/src/webapp/WEB-INF/web.xml 2007-09-29 21:56:16 UTC (rev 141)
@@ -6,11 +6,13 @@
<listener>
<listener-class>
- org.springframework.web.context.ContextLoaderListener</listener-class>
+ org.springframework.web.context.ContextLoaderListener
+ </listener-class>
</listener>
<listener>
<listener-class>
- org.springframework.web.context.request.RequestContextListener</listener-class>
+ org.springframework.web.context.request.RequestContextListener
+ </listener-class>
</listener>
<description>web.xml</description>
@@ -21,6 +23,11 @@
<param-value>/WEB-INF/spring-config.xml</param-value>
</context-param>
+ <context-param>
+ <param-name>javax.faces.application.CONFIG_FILES</param-name>
+ <param-value>/WEB-INF/faces-config.xml</param-value>
+ </context-param>
+
<servlet>
<servlet-name>Faces Servlet</servlet-name>
<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
@@ -29,10 +36,6 @@
<servlet-mapping>
<servlet-name>Faces Servlet</servlet-name>
- <url-pattern>*.faces</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>Faces Servlet</servlet-name>
<url-pattern>*.jsf</url-pattern>
</servlet-mapping>
</web-app>
\ No newline at end of file
Deleted: trunk/mud4j-web/src/webapp/hello.jsp
===================================================================
--- trunk/mud4j-web/src/webapp/hello.jsp 2007-09-29 21:42:59 UTC (rev 140)
+++ trunk/mud4j-web/src/webapp/hello.jsp 2007-09-29 21:56:16 UTC (rev 141)
@@ -1,16 +0,0 @@
-<html>
- <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
- <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-
- <f:view>
- <head>
- <title>A Simple JavaServer Faces Application (login)</title>
- </head>
- <body>
- Hi there!
- <h:form>
- <h:commandButton value="Back" action="index"/>
- </h:form>
- </body>
- </f:view>
-</html>
\ No newline at end of file
Deleted: trunk/mud4j-web/src/webapp/index.jsp
===================================================================
--- trunk/mud4j-web/src/webapp/index.jsp 2007-09-29 21:42:59 UTC (rev 140)
+++ trunk/mud4j-web/src/webapp/index.jsp 2007-09-29 21:56:16 UTC (rev 141)
@@ -1,32 +0,0 @@
-<html>
- <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
- <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-
- <f:view>
- <head>
- <title>A Simple JavaServer Faces Application (login)</title>
- </head>
- <body>
- <h:form>
- <h3>Please enter your name and password.</h3>
- <table>
- <tr>
- <td>Name:</td>
- <td>
-
- </td>
- </tr>
- <tr>
- <td>Password:</td>
- <td>
- </td>
- </tr>
- </table>
- <p>
- <h:commandButton value="Login" action="login"/>
- </p>
- <b>
- </h:form>
- </body>
- </f:view>
-</html>
\ No newline at end of file
Copied: trunk/mud4j-web/src/webapp/login.jsp (from rev 119, trunk/mud4j-web/src/webapp/hello.jsp)
===================================================================
--- trunk/mud4j-web/src/webapp/login.jsp (rev 0)
+++ trunk/mud4j-web/src/webapp/login.jsp 2007-09-29 21:56:16 UTC (rev 141)
@@ -0,0 +1,22 @@
+<%@ page contentType="text/html; charset=UTF-8"%>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://myfaces.apache.org/tomahawk" prefix="t"%>
+<html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+ <title></title>
+ </head>
+ <body>
+ <f:view>
+ <h:form>
+ <h:inputText id="username" value="#{login.username}" required="true" />
+ <h:inputSecret id="password" value="#{login.password}" required="true"/>
+ <h:commandButton id="loginCmd" value="Login" action="#{login.verifyLogin}" />
+ <h:message for="username" styleClass="errorText"/>
+ <h:message for="password" styleClass="errorText"/>
+ </h:form>
+ </f:view>
+ </body>
+</html>
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mpu...@us...> - 2007-06-14 03:29:59
|
Revision: 139
http://mud4j.svn.sourceforge.net/mud4j/?rev=139&view=rev
Author: mpurland
Date: 2007-06-13 20:29:56 -0700 (Wed, 13 Jun 2007)
Log Message:
-----------
Fix the javadoc and format.
Modified Paths:
--------------
trunk/mud4j-core/src/java/net/sf/mud4j/effect/Effectable.java
Modified: trunk/mud4j-core/src/java/net/sf/mud4j/effect/Effectable.java
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/effect/Effectable.java 2007-06-14 03:28:41 UTC (rev 138)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/effect/Effectable.java 2007-06-14 03:29:56 UTC (rev 139)
@@ -16,25 +16,25 @@
package net.sf.mud4j.effect;
-import java.util.List;
-
/**
- * Provide an interface for objects to handle effects by providing
- * a {@link EffectBehavior}.
+ * Provide an interface for objects to handle effects by providing a
+ * {@link EffectBehavior}.
*
* @author Matthew Purland
*/
public interface Effectable {
-
+
/**
* Get effect behavior to handle effects.
*
* @return Returns the effect behavior.
*/
public EffectBehavior getEffectBehavior();
-
+
/**
* Set effect behavior on the effectable object.
+ *
+ * @param effectBehavior The effect behavior
*/
public void setEffectBehavior(EffectBehavior effectBehavior);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mpu...@us...> - 2007-06-14 03:28:42
|
Revision: 138
http://mud4j.svn.sourceforge.net/mud4j/?rev=138&view=rev
Author: mpurland
Date: 2007-06-13 20:28:41 -0700 (Wed, 13 Jun 2007)
Log Message:
-----------
Remove unused @param tags in javadoc.
Modified Paths:
--------------
trunk/mud4j-core/src/java/net/sf/mud4j/effect/Effect.java
Modified: trunk/mud4j-core/src/java/net/sf/mud4j/effect/Effect.java
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/effect/Effect.java 2007-06-14 03:27:57 UTC (rev 137)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/effect/Effect.java 2007-06-14 03:28:41 UTC (rev 138)
@@ -27,7 +27,6 @@
/**
* Apply effect on the target.
*
- * @param target Target object to apply effect on.
* @throws EffectException in case of an apply failure.
*/
public void apply() throws EffectException;
@@ -35,7 +34,6 @@
/**
* Undo the effect from the target.
*
- * @param target Target object to remove effect from.
* @throws EffectException in case of an undo failure.
*/
public void undo() throws EffectException;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mpu...@us...> - 2007-06-14 03:28:02
|
Revision: 137
http://mud4j.svn.sourceforge.net/mud4j/?rev=137&view=rev
Author: mpurland
Date: 2007-06-13 20:27:57 -0700 (Wed, 13 Jun 2007)
Log Message:
-----------
Format the class.
Modified Paths:
--------------
trunk/mud4j-core/src/java/net/sf/mud4j/effect/Effect.java
Modified: trunk/mud4j-core/src/java/net/sf/mud4j/effect/Effect.java
===================================================================
--- trunk/mud4j-core/src/java/net/sf/mud4j/effect/Effect.java 2007-06-03 01:53:22 UTC (rev 136)
+++ trunk/mud4j-core/src/java/net/sf/mud4j/effect/Effect.java 2007-06-14 03:27:57 UTC (rev 137)
@@ -20,40 +20,45 @@
* Effect to provide addon effects for specific objects.
*
* @todo use decorator pattern with effects with characters and items and others
- *
* @author Matthew Purland
*/
public interface Effect {
/**
* Apply effect on the target.
+ *
* @param target Target object to apply effect on.
* @throws EffectException in case of an apply failure.
*/
public void apply() throws EffectException;
-
+
/**
* Undo the effect from the target.
+ *
* @param target Target object to remove effect from.
* @throws EffectException in case of an undo failure.
*/
public void undo() throws EffectException;
-
+
/**
* Determine if the effect has expired duration.
+ *
* @return Returns whether the effect has expired yet.
*/
public boolean hasExpired();
-
+
/**
- * Determine if the effect is permanent. Permanent status means
- * that the effect cannot be removed.
- * @return Retruns whether the effect is a permanent effect and cannot expire.
+ * Determine if the effect is permanent. Permanent status means that the
+ * effect cannot be removed.
+ *
+ * @return Retruns whether the effect is a permanent effect and cannot
+ * expire.
*/
public boolean isPermanent();
-
+
/**
* Get name of the effect.
+ *
* @return Returns the name of the effect.
*/
public String getName();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
