| [Arakhnę-Dev] [300] * [SFC-79] |
[ Thread Index |
Date Index
| More arakhne.org/dev Archives
]
Revision: 300
Author: galland
Date: 2011-10-24 22:54:59 +0200 (Mon, 24 Oct 2011)
Log Message:
-----------
* [SFC-79]
Modified Paths:
--------------
trunk/arakhneLog4J/src/main/java/org/arakhne/logging/ApacheLogger.java
trunk/arakhneLogger/src/main/java/org/arakhne/logging/AbstractLogger.java
trunk/arakhneLogger/src/main/java/org/arakhne/logging/AbstractPrintStreamLogger.java
trunk/arakhneLogger/src/main/java/org/arakhne/logging/AbstractStandAloneLogger.java
trunk/arakhneLogger/src/main/java/org/arakhne/logging/SunLogger.java
trunk/arakhneRefs/src/main/java/org/arakhne/util/ref/AbstractWeakSoftValueMap.java
trunk/arakhneRefs/src/main/java/org/arakhne/util/ref/ComparableSoftReference.java
trunk/arakhneRefs/src/main/java/org/arakhne/util/ref/ComparableWeakReference.java
trunk/arakhneRefs/src/main/java/org/arakhne/util/ref/SoftValueMap.java
trunk/arakhneRefs/src/main/java/org/arakhne/util/ref/WeakArrayList.java
trunk/arakhneRefs/src/main/java/org/arakhne/util/ref/WeakValueMap.java
trunk/arakhneRefs/src/test/java/org/arakhne/junit/AbstractRepeatedTest.java
trunk/arakhneRefs/src/test/java/org/arakhne/junit/AbstractTestCase.java
trunk/arakhneVmutils/java/pom.xml
trunk/arakhneVmutils/java/src/main/java/org/arakhne/vmutil/DynamicURLClassLoader.java
trunk/arakhneVmutils/java/src/main/java/org/arakhne/vmutil/OperatingSystemDiskUtilWrapper.java
trunk/arakhneVmutils/java/src/main/java/org/arakhne/vmutil/OperatingSystemNativeWrapper.java
trunk/arakhneVmutils/java/src/main/java/org/arakhne/vmutil/OperatingSystemUDevWrapper.java
trunk/arakhneVmutils/java/src/main/java/org/arakhne/vmutil/ThreadServiceFinder.java
trunk/arakhneVmutils/native/josuuid/mingw32/pom.xml
trunk/maventools/src/main/java/org/arakhne/maven/AbstractArakhneMojo.java
trunk/maventools/src/main/java/org/arakhne/maven/ExtendedArtifact.java
trunk/pom.xml
Modified: trunk/arakhneLog4J/src/main/java/org/arakhne/logging/ApacheLogger.java
===================================================================
--- trunk/arakhneLog4J/src/main/java/org/arakhne/logging/ApacheLogger.java 2011-10-24 16:36:02 UTC (rev 299)
+++ trunk/arakhneLog4J/src/main/java/org/arakhne/logging/ApacheLogger.java 2011-10-24 20:54:59 UTC (rev 300)
@@ -88,6 +88,7 @@
/** {@InheritDoc}
*/
+ @Override
public void log(Object source, LogLevel level, String msg, Throwable exception) {
this.bindedLogger.log(toApacheLevel(level),msg,exception);
fireLoggerEvent(source, level, msg);
@@ -100,6 +101,7 @@
*
* @return {@InheritDoc}
*/
+ @Override
public String getName() {
return this.bindedLogger.getName();
}
Modified: trunk/arakhneLogger/src/main/java/org/arakhne/logging/AbstractLogger.java
===================================================================
--- trunk/arakhneLogger/src/main/java/org/arakhne/logging/AbstractLogger.java 2011-10-24 16:36:02 UTC (rev 299)
+++ trunk/arakhneLogger/src/main/java/org/arakhne/logging/AbstractLogger.java 2011-10-24 20:54:59 UTC (rev 300)
@@ -56,6 +56,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void setLogLevel(LogLevel level) {
this.minLevel = level;
}
@@ -63,6 +64,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public final LogLevel getLogLevel() {
if (this.minLevel==null) return LoggingSystem.getLoggingSystem().getDefaultLogLevel();
return this.minLevel;
@@ -70,6 +72,7 @@
/** {@InheritDoc}
*/
+ @Override
public final void debug(Object source, String arg0, Throwable arg1) {
log(source,LogLevel.DEBUG,arg0,arg1);
}
@@ -77,6 +80,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public final void debug(Object source, String arg0) {
log(source, LogLevel.DEBUG,arg0);
}
@@ -84,6 +88,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public final void error(Object source, String arg0, Throwable arg1) {
log(source,LogLevel.ERROR,arg0,arg1);
}
@@ -91,6 +96,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public final void error(Object source, String arg0) {
log(source,LogLevel.ERROR,arg0);
}
@@ -98,6 +104,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public final void info(Object source, String arg0, Throwable arg1) {
log(source,LogLevel.INFO,arg0,arg1);
}
@@ -105,6 +112,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public final void info(Object source, String arg0) {
log(source,LogLevel.INFO,arg0);
}
@@ -112,6 +120,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public final void warn(Object source, String arg0, Throwable arg1) {
log(source,LogLevel.WARNING,arg0,arg1);
}
@@ -119,52 +128,49 @@
/**
* {@inheritDoc}
*/
+ @Override
public final void warn(Object source, String arg0) {
log(source,LogLevel.WARNING,arg0);
}
/** {@InheritDoc}
*/
+ @Override
public void log(Object source, LogLevel level, String msg) {
log(source, level, msg, null);
}
/** {@InheritDoc}
- *
- * @return {@InheritDoc}
*/
+ @Override
public boolean isDebugEnabled() {
return isLoggableFor(LogLevel.DEBUG);
}
/** {@InheritDoc}
- *
- * @return {@InheritDoc}
*/
+ @Override
public boolean isErrorEnabled() {
return isLoggableFor(LogLevel.ERROR);
}
/** {@InheritDoc}
- *
- * @return {@InheritDoc}
*/
+ @Override
public boolean isInfoEnabled() {
return isLoggableFor(LogLevel.INFO);
}
/** {@InheritDoc}
- *
- * @return {@InheritDoc}
*/
+ @Override
public boolean isWarnEnabled() {
return isLoggableFor(LogLevel.WARNING);
}
- /** Add listener on logger events.
- *
- * @param listener
+ /** {@inheritDoc}
*/
+ @Override
public final void addLoggerEventListener(LoggerEventListener listener) {
if (this.listeners==null) {
this.listeners = new ArrayList<LoggerEventListener>();
@@ -172,10 +178,9 @@
this.listeners.add(listener);
}
- /** Remove listener on logger events.
- *
- * @param listener
+ /** {@inheritDoc}
*/
+ @Override
public void removeLoggerEventListener(LoggerEventListener listener) {
if (this.listeners!=null) {
this.listeners.remove(listener);
Modified: trunk/arakhneLogger/src/main/java/org/arakhne/logging/AbstractPrintStreamLogger.java
===================================================================
--- trunk/arakhneLogger/src/main/java/org/arakhne/logging/AbstractPrintStreamLogger.java 2011-10-24 16:36:02 UTC (rev 299)
+++ trunk/arakhneLogger/src/main/java/org/arakhne/logging/AbstractPrintStreamLogger.java 2011-10-24 20:54:59 UTC (rev 300)
@@ -69,6 +69,7 @@
/** {@InheritDoc}
*/
+ @Override
public void log(Object source, LogLevel level, String msg, Throwable exception) {
if (isLoggableFor(level)) {
Modified: trunk/arakhneLogger/src/main/java/org/arakhne/logging/AbstractStandAloneLogger.java
===================================================================
--- trunk/arakhneLogger/src/main/java/org/arakhne/logging/AbstractStandAloneLogger.java 2011-10-24 16:36:02 UTC (rev 299)
+++ trunk/arakhneLogger/src/main/java/org/arakhne/logging/AbstractStandAloneLogger.java 2011-10-24 20:54:59 UTC (rev 300)
@@ -119,6 +119,7 @@
/** {@InheritDoc}
*/
+ @Override
public String getName() {
return this.name;
}
Modified: trunk/arakhneLogger/src/main/java/org/arakhne/logging/SunLogger.java
===================================================================
--- trunk/arakhneLogger/src/main/java/org/arakhne/logging/SunLogger.java 2011-10-24 16:36:02 UTC (rev 299)
+++ trunk/arakhneLogger/src/main/java/org/arakhne/logging/SunLogger.java 2011-10-24 20:54:59 UTC (rev 300)
@@ -87,6 +87,7 @@
/** {@InheritDoc}
*/
+ @Override
public void log(Object source, LogLevel level, String msg, Throwable exception) {
this.bindedLogger.log(toSunLevel(level),msg,exception);
fireLoggerEvent(source, level, msg);
@@ -96,9 +97,8 @@
// **************************************************************************************//
/** {@InheritDoc}
- *
- * @return {@InheritDoc}
*/
+ @Override
public String getName() {
return this.bindedLogger.getName();
}
Modified: trunk/arakhneRefs/src/main/java/org/arakhne/util/ref/AbstractWeakSoftValueMap.java
===================================================================
--- trunk/arakhneRefs/src/main/java/org/arakhne/util/ref/AbstractWeakSoftValueMap.java 2011-10-24 16:36:02 UTC (rev 299)
+++ trunk/arakhneRefs/src/main/java/org/arakhne/util/ref/AbstractWeakSoftValueMap.java 2011-10-24 20:54:59 UTC (rev 300)
@@ -441,7 +441,7 @@
@SuppressWarnings("unchecked")
@Override
public final <T> T[] toArray(T[] a) {
- Entry[] tab;
+ Entry<?,?>[] tab;
expurgeNow();
int count = AbstractWeakSoftValueMap.this.map.size();
if (a==null || a.length<count) {
Modified: trunk/arakhneRefs/src/main/java/org/arakhne/util/ref/ComparableSoftReference.java
===================================================================
--- trunk/arakhneRefs/src/main/java/org/arakhne/util/ref/ComparableSoftReference.java 2011-10-24 16:36:02 UTC (rev 299)
+++ trunk/arakhneRefs/src/main/java/org/arakhne/util/ref/ComparableSoftReference.java 2011-10-24 20:54:59 UTC (rev 300)
@@ -72,6 +72,7 @@
* @param o {@inheritDoc}
* @return {@inheritDoc}
*/
+ @Override
@SuppressWarnings("unchecked")
public int compareTo(Object o) {
Object oth = (o instanceof Reference) ? ((Reference<?>)o).get() : o;
Modified: trunk/arakhneRefs/src/main/java/org/arakhne/util/ref/ComparableWeakReference.java
===================================================================
--- trunk/arakhneRefs/src/main/java/org/arakhne/util/ref/ComparableWeakReference.java 2011-10-24 16:36:02 UTC (rev 299)
+++ trunk/arakhneRefs/src/main/java/org/arakhne/util/ref/ComparableWeakReference.java 2011-10-24 20:54:59 UTC (rev 300)
@@ -72,6 +72,7 @@
* @param o {@inheritDoc}
* @return {@inheritDoc}
*/
+ @Override
@SuppressWarnings("unchecked")
public int compareTo(Object o) {
Object oth = (o instanceof Reference) ? ((Reference<?>)o).get() : o;
Modified: trunk/arakhneRefs/src/main/java/org/arakhne/util/ref/SoftValueMap.java
===================================================================
--- trunk/arakhneRefs/src/main/java/org/arakhne/util/ref/SoftValueMap.java 2011-10-24 16:36:02 UTC (rev 299)
+++ trunk/arakhneRefs/src/main/java/org/arakhne/util/ref/SoftValueMap.java 2011-10-24 20:54:59 UTC (rev 300)
@@ -165,28 +165,24 @@
/**
* {@inheritDoc}
- *
- * @return {@inheritDoc}
*/
+ @Override
public K getKey() {
return this.k;
}
/**
* {@inheritDoc}
- *
- * @return {@inheritDoc}
*/
+ @Override
public V getValue() {
return unmaskNull(get());
}
/**
* {@inheritDoc}
- *
- * @param o {@inheritDoc}
- * @return {@inheritDoc}
*/
+ @Override
public V setValue(V o) {
throw new UnsupportedOperationException();
}
Modified: trunk/arakhneRefs/src/main/java/org/arakhne/util/ref/WeakArrayList.java
===================================================================
--- trunk/arakhneRefs/src/main/java/org/arakhne/util/ref/WeakArrayList.java 2011-10-24 16:36:02 UTC (rev 299)
+++ trunk/arakhneRefs/src/main/java/org/arakhne/util/ref/WeakArrayList.java 2011-10-24 20:54:59 UTC (rev 300)
@@ -70,8 +70,6 @@
*/
public class WeakArrayList<T> extends AbstractList<T> {
- private static final long serialVersionUID = 2601162363164961860L;
-
/** This value represents a null value given by the user.
*/
private static final Object NULL_VALUE = new Object();
Modified: trunk/arakhneRefs/src/main/java/org/arakhne/util/ref/WeakValueMap.java
===================================================================
--- trunk/arakhneRefs/src/main/java/org/arakhne/util/ref/WeakValueMap.java 2011-10-24 16:36:02 UTC (rev 299)
+++ trunk/arakhneRefs/src/main/java/org/arakhne/util/ref/WeakValueMap.java 2011-10-24 20:54:59 UTC (rev 300)
@@ -166,28 +166,24 @@
/**
* {@inheritDoc}
- *
- * @return {@inheritDoc}
*/
+ @Override
public K getKey() {
return this.k;
}
/**
* {@inheritDoc}
- *
- * @return {@inheritDoc}
*/
+ @Override
public V getValue() {
return unmaskNull(get());
}
/**
* {@inheritDoc}
- *
- * @param o {@inheritDoc}
- * @return {@inheritDoc}
*/
+ @Override
public V setValue(V o) {
throw new UnsupportedOperationException();
}
Modified: trunk/arakhneRefs/src/test/java/org/arakhne/junit/AbstractRepeatedTest.java
===================================================================
--- trunk/arakhneRefs/src/test/java/org/arakhne/junit/AbstractRepeatedTest.java 2011-10-24 16:36:02 UTC (rev 299)
+++ trunk/arakhneRefs/src/test/java/org/arakhne/junit/AbstractRepeatedTest.java 2011-10-24 20:54:59 UTC (rev 300)
@@ -109,20 +109,24 @@
this.result = new WeakReference<TestResult>(result);
}
+ @Override
public void addError(Test test, Throwable t) {
TestResult r = this.result.get();
if (r!=null) r.stop();
}
+ @Override
public void addFailure(Test test, AssertionFailedError t) {
TestResult r = this.result.get();
if (r!=null) r.stop();
}
+ @Override
public void endTest(Test test) {
//
}
+ @Override
public void startTest(Test test) {
//
}
@@ -144,6 +148,7 @@
super(clazz);
}
+ @Override
public void setLoopIndex(int index) {
this.loopIndex = index;
Enumeration<?> e = tests();
@@ -153,6 +158,7 @@
}
}
+ @Override
public int getLoopIndex() {
return this.loopIndex;
}
Modified: trunk/arakhneRefs/src/test/java/org/arakhne/junit/AbstractTestCase.java
===================================================================
--- trunk/arakhneRefs/src/test/java/org/arakhne/junit/AbstractTestCase.java 2011-10-24 16:36:02 UTC (rev 299)
+++ trunk/arakhneRefs/src/test/java/org/arakhne/junit/AbstractTestCase.java 2011-10-24 20:54:59 UTC (rev 300)
@@ -88,10 +88,12 @@
private int loopIndex = -1;
+ @Override
public int getLoopIndex() {
return this.loopIndex;
}
+ @Override
public void setLoopIndex(int index) {
this.loopIndex = index;
}
@@ -461,7 +463,7 @@
protected <T, X> void assertSimilars(String message, T expected, T actual) {
if (expected==actual) return;
if (expected instanceof Collection)
- assertSimilars(message, (Collection)expected, (Collection)actual);
+ assertSimilars(message, (Collection<?>)expected, (Collection<?>)actual);
else if (expected instanceof Point2D)
assertSimilars(message, (Point2D)expected, (Point2D)actual);
else if (expected instanceof Date)
Modified: trunk/arakhneVmutils/java/pom.xml
===================================================================
--- trunk/arakhneVmutils/java/pom.xml 2011-10-24 16:36:02 UTC (rev 299)
+++ trunk/arakhneVmutils/java/pom.xml 2011-10-24 20:54:59 UTC (rev 300)
@@ -15,9 +15,9 @@
<relativePath>../../pom.xml</relativePath>
</parent>
+ <groupId>org.arakhne.afc</groupId>
<artifactId>arakhneVmutils-java</artifactId>
<packaging>jar</packaging>
- <groupId>org.arakhne.afc</groupId>
<version>6.4-SNAPSHOT</version>
<name>VM Utilities</name>
<url>http://www.arakhne.org/arakhneVmutils/</url>
Modified: trunk/arakhneVmutils/java/src/main/java/org/arakhne/vmutil/DynamicURLClassLoader.java
===================================================================
--- trunk/arakhneVmutils/java/src/main/java/org/arakhne/vmutil/DynamicURLClassLoader.java 2011-10-24 16:36:02 UTC (rev 299)
+++ trunk/arakhneVmutils/java/src/main/java/org/arakhne/vmutil/DynamicURLClassLoader.java 2011-10-24 20:54:59 UTC (rev 300)
@@ -109,6 +109,7 @@
*/
public void addURL(final URL url) {
AccessController.doPrivileged(new PrivilegedAction<Object>() {
+ @Override
public Object run() {
DynamicURLClassLoader.this._ucp.addURL(url);
return null;
@@ -177,6 +178,7 @@
protected Class<?> findClass(final String name) throws ClassNotFoundException {
try {
return AccessController.doPrivileged(new PrivilegedExceptionAction<Class<?>>() {
+ @Override
public Class<?> run() throws ClassNotFoundException {
String path = name.replace('.', '/').concat(".class"); //$NON-NLS-1$
Resource res = DynamicURLClassLoader.this._ucp.getResource(path, false);
@@ -356,6 +358,7 @@
*/
URL url =
AccessController.doPrivileged(new PrivilegedAction<URL>() {
+ @Override
public URL run() {
return DynamicURLClassLoader.this._ucp.findResource(name, true);
}
@@ -385,6 +388,7 @@
}
do {
URL u = AccessController.doPrivileged(new PrivilegedAction<URL>() {
+ @Override
public URL run() {
if (!e.hasMoreElements())
return null;
@@ -399,6 +403,7 @@
return (this.url != null);
}
+ @Override
public URL nextElement() {
if (!next()) {
throw new NoSuchElementException();
@@ -408,6 +413,7 @@
return u;
}
+ @Override
public boolean hasMoreElements() {
return next();
}
@@ -485,6 +491,7 @@
if (sm != null) {
final Permission fp = p;
AccessController.doPrivileged(new PrivilegedAction<Object>() {
+ @Override
public Object run() throws SecurityException {
sm.checkPermission(fp);
return null;
@@ -514,6 +521,7 @@
// Need a privileged block to create the class loader
DynamicURLClassLoader ucl =
AccessController.doPrivileged(new PrivilegedAction<DynamicURLClassLoader>() {
+ @Override
public DynamicURLClassLoader run() {
// Now set the context on the loader using the one we saved,
// not the one inside the privileged block...
Modified: trunk/arakhneVmutils/java/src/main/java/org/arakhne/vmutil/OperatingSystemDiskUtilWrapper.java
===================================================================
--- trunk/arakhneVmutils/java/src/main/java/org/arakhne/vmutil/OperatingSystemDiskUtilWrapper.java 2011-10-24 16:36:02 UTC (rev 299)
+++ trunk/arakhneVmutils/java/src/main/java/org/arakhne/vmutil/OperatingSystemDiskUtilWrapper.java 2011-10-24 20:54:59 UTC (rev 300)
@@ -52,6 +52,7 @@
/** {@inheritDoc}
*/
+ @Override
public String getOSSerialNumber(boolean enableSuperUser, boolean enableGUI) {
File f;
f = new File("/dev/disk0s1"); //$NON-NLS-1$
@@ -63,6 +64,7 @@
/** {@inheritDoc}
*/
+ @Override
public String getOSUUID(boolean enableSuperUser, boolean enableGUI) {
File f;
f = new File("/dev/disk0s1"); //$NON-NLS-1$
@@ -75,6 +77,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public OperatingSystemIdentificationType getIdentificationType() {
return OperatingSystemIdentificationType.HARD_DISK;
}
Modified: trunk/arakhneVmutils/java/src/main/java/org/arakhne/vmutil/OperatingSystemNativeWrapper.java
===================================================================
--- trunk/arakhneVmutils/java/src/main/java/org/arakhne/vmutil/OperatingSystemNativeWrapper.java 2011-10-24 16:36:02 UTC (rev 299)
+++ trunk/arakhneVmutils/java/src/main/java/org/arakhne/vmutil/OperatingSystemNativeWrapper.java 2011-10-24 20:54:59 UTC (rev 300)
@@ -45,15 +45,18 @@
/** {@inheritDoc}
*/
+ @Override
public native String getOSSerialNumber(boolean enableSuperUser, boolean enableGUI);
/** {@inheritDoc}
*/
+ @Override
public native String getOSUUID(boolean enableSuperUser, boolean enableGUI);
/**
* {@inheritDoc}
*/
+ @Override
public OperatingSystemIdentificationType getIdentificationType() {
return this.type;
}
Modified: trunk/arakhneVmutils/java/src/main/java/org/arakhne/vmutil/OperatingSystemUDevWrapper.java
===================================================================
--- trunk/arakhneVmutils/java/src/main/java/org/arakhne/vmutil/OperatingSystemUDevWrapper.java 2011-10-24 16:36:02 UTC (rev 299)
+++ trunk/arakhneVmutils/java/src/main/java/org/arakhne/vmutil/OperatingSystemUDevWrapper.java 2011-10-24 20:54:59 UTC (rev 300)
@@ -55,6 +55,7 @@
/** {@inheritDoc}
*/
+ @Override
public String getOSSerialNumber(boolean enableSuperUser, boolean enableGUI) {
File f;
f = new File("/dev/sda"); //$NON-NLS-1$
@@ -70,6 +71,7 @@
/** {@inheritDoc}
*/
+ @Override
public String getOSUUID(boolean enableSuperUser, boolean enableGUI) {
File f;
f = new File("/dev/sda"); //$NON-NLS-1$
@@ -86,6 +88,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public OperatingSystemIdentificationType getIdentificationType() {
return OperatingSystemIdentificationType.HARD_DISK;
}
Modified: trunk/arakhneVmutils/java/src/main/java/org/arakhne/vmutil/ThreadServiceFinder.java
===================================================================
--- trunk/arakhneVmutils/java/src/main/java/org/arakhne/vmutil/ThreadServiceFinder.java 2011-10-24 16:36:02 UTC (rev 299)
+++ trunk/arakhneVmutils/java/src/main/java/org/arakhne/vmutil/ThreadServiceFinder.java 2011-10-24 20:54:59 UTC (rev 300)
@@ -96,6 +96,7 @@
*
* @return {@inheritDoc}
*/
+ @Override
public ExecutorService getExecutorService() {
if (this.executorService==null) {
this.executorService = Executors.newCachedThreadPool();
@@ -107,6 +108,7 @@
*
* @return {@inheritDoc}
*/
+ @Override
public ScheduledExecutorService getScheduledExecutorService() {
if (this.scheduledExecutorService==null) {
this.scheduledExecutorService = Executors.newScheduledThreadPool(3);
Modified: trunk/arakhneVmutils/native/josuuid/mingw32/pom.xml
===================================================================
--- trunk/arakhneVmutils/native/josuuid/mingw32/pom.xml 2011-10-24 16:36:02 UTC (rev 299)
+++ trunk/arakhneVmutils/native/josuuid/mingw32/pom.xml 2011-10-24 20:54:59 UTC (rev 300)
@@ -1,122 +1,123 @@
<?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";>
+<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>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>josuuid</artifactId>
+ <parent>
+ <artifactId>josuuid</artifactId>
+ <groupId>org.arakhne.afc</groupId>
+ <version>6.4-SNAPSHOT</version>
+ </parent>
+
<groupId>org.arakhne.afc</groupId>
+ <artifactId>josuuid-mingw32</artifactId>
+ <packaging>dll</packaging>
<version>6.4-SNAPSHOT</version>
- </parent>
+ <name>Win 32 OS UUID Library</name>
- <groupId>org.arakhne.afc</groupId>
- <artifactId>josuuid-mingw32</artifactId>
- <packaging>dll</packaging>
- <version>6.4-SNAPSHOT</version>
- <name>Win 32 OS UUID Library</name>
-
<!-- ======================================= -->
- <!-- ==== Project Information === -->
+ <!-- ==== Project Information === -->
<!-- ======================================= -->
-
- <build>
- <finalName>${project.artifactId}</finalName>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-beanshell</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <evaluateBeanshell>
- <condition>
- String path = System.getenv("PATH");
- String[] parts = path.split(File.pathSeparator);
- boolean ok = false;
- for(int i=0; !ok && i<parts.length; i++) {
- ok = new File(parts[i],"i586-mingw32msvc-gcc").canExecute();
- }
- ok
- </condition>
- </evaluateBeanshell>
- <requireOS>
- <name>linux</name>
- <family>unix</family>
- </requireOS>
- </rules>
- <fail>true</fail>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <build>
+ <finalName>${project.artifactId}</finalName>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>native-maven-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <compilerProvider>generic</compilerProvider>
- <compilerExecutable>i586-mingw32msvc-gcc</compilerExecutable>
- <compilerStartOptions>
- <compilerStartOption>-O0 -Wall -Werror -fmessage-length=0</compilerStartOption>
- </compilerStartOptions>
-
- <javahOS>linux</javahOS> <!-- not 'windows' to retreive the jni_md.h file -->
-
- <sources>
- <source>
- <directory>../src/main/native</directory>
- <fileNames>
- <fileName>utils.c</fileName>
- <fileName>winos.c</fileName>
- <fileName>OperatingSystemNativeWrapperJNI.c</fileName>
- </fileNames>
- </source>
- </sources>
-
- <linkerExecutable>i586-mingw32msvc-gcc</linkerExecutable>
- <linkerStartOptions>
- <linkerStartOption>-shared</linkerStartOption>
- </linkerStartOptions>
-
- </configuration>
-
- <executions>
- <execution>
- <id>javah</id>
- <phase>generate-sources</phase>
- <configuration>
- <javahClassNames>
- <className>org.arakhne.vmutil.OperatingSystemNativeWrapper</className>
- </javahClassNames>
- </configuration>
- <goals>
- <goal>javah</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <forkMode>once</forkMode>
- <environmentVariables>
- <LD_LIBRARY_PATH>${project.build.directory}</LD_LIBRARY_PATH>
- </environmentVariables>
- </configuration>
- </plugin>
-
- </plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce-beanshell</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <evaluateBeanshell>
+ <condition>
+ String path = System.getenv("PATH");
+ String[] parts = path.split(File.pathSeparator);
+ boolean ok = false;
+ for(int i=0; !ok && i<parts.length; i++) {
+ ok = new File(parts[i],"i586-mingw32msvc-gcc").canExecute();
+ }
+ ok
+ </condition>
+ </evaluateBeanshell>
+ <requireOS>
+ <name>linux</name>
+ <family>unix</family>
+ </requireOS>
+ </rules>
+ <fail>true</fail>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
- </build>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>native-maven-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <compilerProvider>generic</compilerProvider>
+ <compilerExecutable>i586-mingw32msvc-gcc</compilerExecutable>
+ <compilerStartOptions>
+ <compilerStartOption>-O0 -Wall -Werror -fmessage-length=0</compilerStartOption>
+ </compilerStartOptions>
+ <javahOS>linux</javahOS> <!-- not 'windows' to retreive the jni_md.h file -->
+ <sources>
+ <source>
+ <directory>../src/main/native</directory>
+ <fileNames>
+ <fileName>utils.c</fileName>
+ <fileName>winos.c</fileName>
+ <fileName>OperatingSystemNativeWrapperJNI.c</fileName>
+ </fileNames>
+ </source>
+ </sources>
+
+ <linkerExecutable>i586-mingw32msvc-gcc</linkerExecutable>
+ <linkerStartOptions>
+ <linkerStartOption>-shared</linkerStartOption>
+ </linkerStartOptions>
+
+ </configuration>
+
+ <executions>
+ <execution>
+ <id>javah</id>
+ <phase>generate-sources</phase>
+ <configuration>
+ <javahClassNames>
+ <className>org.arakhne.vmutil.OperatingSystemNativeWrapper</className>
+ </javahClassNames>
+ </configuration>
+ <goals>
+ <goal>javah</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>once</forkMode>
+ <environmentVariables>
+ <LD_LIBRARY_PATH>${project.build.directory}</LD_LIBRARY_PATH>
+ </environmentVariables>
+ </configuration>
+ </plugin>
+
+ </plugins>
+
+ </build>
+
+
</project>
Modified: trunk/maventools/src/main/java/org/arakhne/maven/AbstractArakhneMojo.java
===================================================================
--- trunk/maventools/src/main/java/org/arakhne/maven/AbstractArakhneMojo.java 2011-10-24 16:36:02 UTC (rev 299)
+++ trunk/maventools/src/main/java/org/arakhne/maven/AbstractArakhneMojo.java 2011-10-24 20:54:59 UTC (rev 300)
@@ -1027,6 +1027,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public final void execute() throws MojoExecutionException {
try {
checkMojoAttributes();
@@ -1278,6 +1279,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean hasNext() {
return this.next!=null;
}
@@ -1285,6 +1287,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public MavenProject next() {
MavenProject n = this.next;
if (n==null) throw new NoSuchElementException();
@@ -1295,6 +1298,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void remove() {
throw new UnsupportedOperationException();
}
@@ -1344,6 +1348,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean hasNext() {
return this.next!=null;
}
@@ -1351,6 +1356,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public Plugin next() {
org.apache.maven.model.Plugin n = this.next;
if (n==null) throw new NoSuchElementException();
@@ -1361,6 +1367,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void remove() {
throw new UnsupportedOperationException();
}
Modified: trunk/maventools/src/main/java/org/arakhne/maven/ExtendedArtifact.java
===================================================================
--- trunk/maventools/src/main/java/org/arakhne/maven/ExtendedArtifact.java 2011-10-24 16:36:02 UTC (rev 299)
+++ trunk/maventools/src/main/java/org/arakhne/maven/ExtendedArtifact.java 2011-10-24 20:54:59 UTC (rev 300)
@@ -256,6 +256,7 @@
* {@inheritDoc}
* @deprecated
*/
+ @Override
@Deprecated
public void addMetadata(ArtifactMetadata metadata) {
this.original.addMetadata(metadata);
@@ -264,6 +265,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public ArtifactHandler getArtifactHandler() {
return this.original.getArtifactHandler();
}
@@ -271,6 +273,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public String getArtifactId() {
return this.original.getArtifactId();
}
@@ -278,6 +281,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public List<ArtifactVersion> getAvailableVersions() {
return this.original.getAvailableVersions();
}
@@ -285,6 +289,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public String getBaseVersion() {
return this.original.getBaseVersion();
}
@@ -292,6 +297,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public String getClassifier() {
return this.original.getClassifier();
}
@@ -299,6 +305,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public String getDependencyConflictId() {
return this.original.getDependencyConflictId();
}
@@ -306,6 +313,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public ArtifactFilter getDependencyFilter() {
return this.original.getDependencyFilter();
}
@@ -313,6 +321,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public List<String> getDependencyTrail() {
return this.original.getDependencyTrail();
}
@@ -320,6 +329,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public String getDownloadUrl() {
return this.original.getDownloadUrl();
}
@@ -327,6 +337,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public File getFile() {
return this.original.getFile();
}
@@ -334,6 +345,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public String getGroupId() {
return this.original.getGroupId();
}
@@ -341,6 +353,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public String getId() {
return this.original.getId();
}
@@ -349,6 +362,7 @@
* {@inheritDoc}
* @deprecated
*/
+ @Override
@Deprecated
public Collection<ArtifactMetadata> getMetadataList() {
return this.original.getMetadataList();
@@ -357,6 +371,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public ArtifactRepository getRepository() {
return this.original.getRepository();
}
@@ -364,6 +379,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public String getScope() {
return this.original.getScope();
}
@@ -371,6 +387,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public ArtifactVersion getSelectedVersion() throws OverConstrainedVersionException {
return this.original.getSelectedVersion();
}
@@ -378,6 +395,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public String getType() {
return this.original.getType();
}
@@ -385,6 +403,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public String getVersion() {
return this.original.getVersion();
}
@@ -392,6 +411,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public VersionRange getVersionRange() {
return this.original.getVersionRange();
}
@@ -399,6 +419,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean hasClassifier() {
return this.original.hasClassifier();
}
@@ -406,6 +427,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean isOptional() {
return this.original.isOptional();
}
@@ -413,6 +435,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean isRelease() {
return this.original.isRelease();
}
@@ -420,6 +443,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean isResolved() {
return this.original.isResolved();
}
@@ -427,6 +451,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean isSelectedVersionKnown() throws OverConstrainedVersionException {
return this.original.isSelectedVersionKnown();
}
@@ -434,6 +459,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean isSnapshot() {
return this.original.isSnapshot();
}
@@ -441,6 +467,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void selectVersion(String version) {
this.original.selectVersion(version);
}
@@ -448,6 +475,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void setArtifactHandler(ArtifactHandler handler) {
this.original.setArtifactHandler(handler);
}
@@ -455,6 +483,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void setArtifactId(String artifactId) {
this.original.setArtifactId(artifactId);
}
@@ -462,6 +491,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void setBaseVersion(String baseVersion) {
this.original.setBaseVersion(baseVersion);
}
@@ -469,6 +499,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void setDependencyFilter(ArtifactFilter artifactFilter) {
this.original.setDependencyFilter(artifactFilter);
}
@@ -476,6 +507,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void setDownloadUrl(String downloadUrl) {
this.original.setDownloadUrl(downloadUrl);
}
@@ -483,6 +515,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void setFile(File destination) {
this.original.setFile(destination);
}
@@ -490,6 +523,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void setGroupId(String groupId) {
this.original.setGroupId(groupId);
}
@@ -497,6 +531,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void setRelease(boolean release) {
this.original.setRelease(release);
}
@@ -504,6 +539,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void setRepository(ArtifactRepository remoteRepository) {
this.original.setRepository(remoteRepository);
}
@@ -511,6 +547,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void setResolved(boolean resolved) {
this.original.setResolved(resolved);
}
@@ -518,6 +555,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void setResolvedVersion(String version) {
this.original.setResolvedVersion(version);
}
@@ -525,6 +563,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void setScope(String scope) {
this.original.setScope(scope);
}
@@ -532,6 +571,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void setVersion(String version) {
this.original.setVersion(version);
}
@@ -539,6 +579,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void setVersionRange(VersionRange newRange) {
this.original.setVersionRange(newRange);
}
@@ -546,6 +587,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void updateVersion(String version, ArtifactRepository localRepository) {
this.original.updateVersion(version, localRepository);
}
@@ -553,6 +595,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public int compareTo(Artifact o) {
return this.original.compareTo(o);
}
@@ -560,6 +603,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void setAvailableVersions(List<ArtifactVersion> versions) {
this.original.setAvailableVersions(versions);
}
@@ -567,6 +611,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void setDependencyTrail(List<String> dependencyTrail) {
this.original.setDependencyTrail(dependencyTrail);
}
@@ -574,6 +619,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public void setOptional(boolean optional) {
this.original.setOptional(optional);
}
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2011-10-24 16:36:02 UTC (rev 299)
+++ trunk/pom.xml 2011-10-24 20:54:59 UTC (rev 300)
@@ -304,6 +304,65 @@
<artifactId>native-maven-plugin</artifactId>
<version>1.0-alpha-7</version>
</plugin>
+ <!-- This plugin's configuration is used to store Eclipse m2e settings
+ only. It has no influence on the Maven build itself. This plugin configuration
+ may be removed if all the developpers are using m2e 1.1 or higher. -->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.arakhne.afc</groupId>
+ <artifactId>tag-replacer</artifactId>
+ <versionRange>[1.1-SNAPSHOT,)</versionRange>
+ <goals>
+ <goal>replaceresource</goal>
+ <goal>generatereplacesrc</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <execute />
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.arakhne.afc</groupId>
+ <artifactId>license-installer</artifactId>
+ <versionRange>[1.1-SNAPSHOT,)</versionRange>
+ <goals>
+ <goal>installlicense</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <execute />
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>native-maven-plugin</artifactId>
+ <versionRange>[0.1,)</versionRange>
+ <goals>
+ <goal>javah</goal>
+ <goal>initialize</goal>
+ <goal>manifest</goal>
+ <goal>link</goal>
+ <goal>compile</goal>
+ <goal>unzipinc</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <execute />
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
<plugins>
@@ -329,7 +388,8 @@
<docfilessubdirs>true</docfilessubdirs>
<bottom><small>Copyright &copy;
${project.inceptionYear}-${year} Arakhn&ecirc;.org
- Consortium. All rights
+ Consortium.
+ All rights
reserved under LGPL license
terms.</small></bottom>
<tags>