|
From: <tre...@us...> - 2007-09-05 17:43:51
|
Revision: 366
http://ogoglio.svn.sourceforge.net/ogoglio/?rev=366&view=rev
Author: trevorolio
Date: 2007-09-05 10:43:54 -0700 (Wed, 05 Sep 2007)
Log Message:
-----------
Fixed up the poms so that mvn clean install might actually clean install.
Modified Paths:
--------------
maven/trunk/ogoglio-common/pom.xml
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIAuthenticator.java
maven/trunk/ogoglio-common/src/main/java/com/ogoglio/util/Log.java
Modified: maven/trunk/ogoglio-common/pom.xml
===================================================================
--- maven/trunk/ogoglio-common/pom.xml 2007-09-05 17:43:47 UTC (rev 365)
+++ maven/trunk/ogoglio-common/pom.xml 2007-09-05 17:43:54 UTC (rev 366)
@@ -12,7 +12,6 @@
<relativePath>../ogoglio</relativePath>
</parent>
<artifactId>ogoglio-common</artifactId>
-
<build>
<resources>
<!-- FILTER RESOURCES FOR SOME CONSTANTS-->
@@ -31,8 +30,12 @@
<!-- things we need to build/run -->
<dependencies>
- <!-- used by some code in the project -->
- <dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIAuthenticator.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIAuthenticator.java 2007-09-05 17:43:47 UTC (rev 365)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/client/WebAPIAuthenticator.java 2007-09-05 17:43:54 UTC (rev 366)
@@ -31,7 +31,6 @@
ArgumentUtils.assertNotEmpty(username);
this.username = username;
ArgumentUtils.assertNotEmpty(password);
-
String body = WebConstants.AUTH_USERNAME_PARAM + "=" + username + "&" + WebConstants.AUTH_PASS_PARAM + "=" + password;
authCookie = wire.getAuthCookieViaPost(serviceDescriptor.getAuthURI(), body, "application/x-www-form-urlencoded");
if(authCookie == null) {
@@ -88,15 +87,4 @@
public String getUsername() {
return username;
}
-
- /*
- public static String requestGuestCookie(URI serviceURI) throws IOException {
- InputStream input = WebAPIClient.performPOST(getAuthGuestURI(serviceURI), "", "text/plain", null);
- if (input == null) {
- return null;
- }
- return StreamUtils.readInput(input);
- }
- */
-
}
Modified: maven/trunk/ogoglio-common/src/main/java/com/ogoglio/util/Log.java
===================================================================
--- maven/trunk/ogoglio-common/src/main/java/com/ogoglio/util/Log.java 2007-09-05 17:43:47 UTC (rev 365)
+++ maven/trunk/ogoglio-common/src/main/java/com/ogoglio/util/Log.java 2007-09-05 17:43:54 UTC (rev 366)
@@ -3,32 +3,38 @@
import org.apache.log4j.Logger;
public class Log {
-
- static Logger log = Logger.getLogger("com.ogoglio");
-
- public static void debug(Object msg) {
- log.debug(msg);
- }
- public static void info(Object msg) {
- log.info(msg);
- }
- public static void info(Object msg,Throwable t) {
- log.info(msg,t);
- }
- public static void warn(Object msg) {
- log.warn(msg);
- }
- public static void error(Object msg) {
- log.error(msg);
- }
- public static void error(Object msg, Throwable t) {
- log.error(msg,t);
- }
- public static void trace(Object msg) {
- log.trace(msg);
- }
- public static void test(Object msg) {
- log.debug("TEST:"+msg);
- }
+ static Logger log = Logger.getLogger("com.ogoglio");
+
+ public static void debug(Object msg) {
+ log.debug(msg);
+ }
+
+ public static void info(Object msg) {
+ log.info(msg);
+ }
+
+ public static void info(Object msg, Throwable t) {
+ log.info(msg, t);
+ }
+
+ public static void warn(Object msg) {
+ log.warn(msg);
+ }
+
+ public static void error(Object msg) {
+ log.error(msg);
+ }
+
+ public static void error(Object msg, Throwable t) {
+ log.error(msg, t);
+ }
+
+ public static void trace(Object msg) {
+ log.trace(msg);
+ }
+
+ public static void test(Object msg) {
+ log.debug("TEST:" + msg);
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|