github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-25 03:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Reverted r270 changes for all pom files. Added some files to svn:ignore.

Browse source
This commit is contained in:
magenoxx 2010-10-28 09:16:36 +00:00
parent 3a784f59ee
commit b0e4549959
12 changed files with 46 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
Mage.Client/pom.xml
View file

@ -10,7 +10,7 @@
</parent> </parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage-client</artifactId> <artifactId>Mage-Client</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>0.3</version> <version>0.3</version>
<name>Mage Client</name> <name>Mage Client</name>
@ -19,17 +19,17 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage</artifactId> <artifactId>Mage</artifactId>
<version>${mage-version}</version> <version>${mage-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage-common</artifactId> <artifactId>Mage-Common</artifactId>
<version>${mage-version}</version> <version>${mage-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage-sets</artifactId> <artifactId>Mage-Sets</artifactId>
<version>${mage-version}</version> <version>${mage-version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
@ -39,7 +39,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>2.0.2</version>
<configuration> <configuration>
<source>1.6</source> <source>1.6</source>
<target>1.6</target> <target>1.6</target>
@ -51,7 +50,26 @@
<encoding>UTF-8</encoding> <encoding>UTF-8</encoding>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifest>
<addClasspath>true</addClasspath>
<classpathPrefix>lib/</classpathPrefix>
<mainClass>mage.client.MageFrame</mainClass>
</manifest>
</archive>
</configuration>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptors>
<descriptor>src/main/assembly/distribution.xml</descriptor>
</descriptors>
</configuration>
</plugin>
</plugins> </plugins>
<finalName>mage-client</finalName> <finalName>mage-client</finalName>

4
Mage.Common/pom.xml
View file

@ -10,7 +10,7 @@
</parent> </parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage-common</artifactId> <artifactId>Mage-Common</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>0.3</version> <version>0.3</version>
<name>Mage Common Classes</name> <name>Mage Common Classes</name>
@ -19,7 +19,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage</artifactId> <artifactId>Mage</artifactId>
<version>${mage-version}</version> <version>${mage-version}</version>
</dependency> </dependency>
</dependencies> </dependencies>

4
Mage.Deck.Constructed/pom.xml
View file

@ -10,7 +10,7 @@
</parent> </parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage-deck-contructed</artifactId> <artifactId>Mage-Deck-Contructed</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>0.3</version> <version>0.3</version>
<name>Mage Deck Constructed</name> <name>Mage Deck Constructed</name>
@ -19,7 +19,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage</artifactId> <artifactId>Mage</artifactId>
<version>${mage-version}</version> <version>${mage-version}</version>
</dependency> </dependency>
</dependencies> </dependencies>

4
Mage.Game.FreeForAll/pom.xml
View file

@ -10,7 +10,7 @@
</parent> </parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage-game-freeforall</artifactId> <artifactId>Mage-Game-FreeForAll</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>0.3</version> <version>0.3</version>
<name>Mage Game Free For All</name> <name>Mage Game Free For All</name>
@ -19,7 +19,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage</artifactId> <artifactId>Mage</artifactId>
<version>${mage-version}</version> <version>${mage-version}</version>
</dependency> </dependency>
</dependencies> </dependencies>

4
Mage.Game.TwoPlayerDuel/pom.xml
View file

@ -10,7 +10,7 @@
</parent> </parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage-game-twoplayerduel</artifactId> <artifactId>Mage-Game-TwoPlayerDuel</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>0.3</version> <version>0.3</version>
<name>Mage Game Two Player</name> <name>Mage Game Two Player</name>
@ -19,7 +19,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage</artifactId> <artifactId>Mage</artifactId>
<version>${mage-version}</version> <version>${mage-version}</version>
</dependency> </dependency>
</dependencies> </dependencies>

4
Mage.Player.AI/pom.xml
View file

@ -10,7 +10,7 @@
</parent> </parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage-player-ai</artifactId> <artifactId>Mage-Player-AI</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>0.3</version> <version>0.3</version>
<name>Mage Player AI</name> <name>Mage Player AI</name>
@ -19,7 +19,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage</artifactId> <artifactId>Mage</artifactId>
<version>${mage-version}</version> <version>${mage-version}</version>
</dependency> </dependency>
</dependencies> </dependencies>

4
Mage.Player.AIMinimax/pom.xml
View file

@ -19,12 +19,12 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage</artifactId> <artifactId>Mage</artifactId>
<version>${mage-version}</version> <version>${mage-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage-player-ai</artifactId> <artifactId>Mage-Player-AI</artifactId>
<version>${mage-version}</version> <version>${mage-version}</version>
</dependency> </dependency>
</dependencies> </dependencies>

4
Mage.Player.Human/pom.xml
View file

@ -10,7 +10,7 @@
</parent> </parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage-player-human</artifactId> <artifactId>Mage-Player-Human</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>0.3</version> <version>0.3</version>
<name>Mage Player Human</name> <name>Mage Player Human</name>
@ -19,7 +19,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage</artifactId> <artifactId>Mage</artifactId>
<version>${mage-version}</version> <version>${mage-version}</version>
</dependency> </dependency>
</dependencies> </dependencies>

9
Mage.Server/pom.xml
View file

@ -10,7 +10,7 @@
</parent> </parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage-server</artifactId> <artifactId>Mage-Server</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>0.3</version> <version>0.3</version>
<name>Mage Server</name> <name>Mage Server</name>
@ -19,19 +19,18 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage</artifactId> <artifactId>Mage</artifactId>
<version>${mage-version}</version> <version>${mage-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage-common</artifactId> <artifactId>Mage-Common</artifactId>
<version>${mage-version}</version> <version>${mage-version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage-sets</artifactId> <artifactId>Mage-Sets</artifactId>
<version>${mage-version}</version> <version>${mage-version}</version>
<scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.sun.xml.bind</groupId> <groupId>com.sun.xml.bind</groupId>

1
Mage.Server/src/mage/server/game/GameController.java
View file

@ -43,7 +43,6 @@ import java.util.logging.Logger;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import mage.Constants;
import mage.Constants.Zone; import mage.Constants.Zone;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.cards.Card; import mage.cards.Card;

4
Mage.Sets/pom.xml
View file

@ -10,7 +10,7 @@
</parent> </parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage-sets</artifactId> <artifactId>Mage-Sets</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>0.3</version> <version>0.3</version>
<name>Mage Sets</name> <name>Mage Sets</name>
@ -19,7 +19,7 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage</artifactId> <artifactId>Mage</artifactId>
<version>${mage-version}</version> <version>${mage-version}</version>
</dependency> </dependency>
</dependencies> </dependencies>

4
Mage/pom.xml
View file

@ -10,10 +10,10 @@
</parent> </parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage</artifactId> <artifactId>Mage</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>0.3</version> <version>0.3</version>
<name>Mage Application</name> <name>Mage Framework</name>
<url>http://maven.apache.org</url> <url>http://maven.apache.org</url>
<dependencies /> <dependencies />