On Fri, Mar 6, 2009 at 5:37 AM, <[email protected]> wrote:
> Author: vsiveton
> Date: Fri Mar 6 13:37:42 2009
> New Revision: 750890
>
> URL: http://svn.apache.org/viewvc?rev=750890&view=rev
> Log:
> o merged r736064 (SHINDIG-870 | Patch from Vincent Siveton | Improve logging
> uses when running tests)
>
> Added:
>
> incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/resources/logging.properties
> (with props)
>
> incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/resources/logging.properties
> (with props)
> Modified:
>
> incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServlet.java
>
> incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcServlet.java
>
> incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthFetcherTest.java
> incubator/shindig/branches/1.0.x-incubating/java/pom.xml
>
> incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/resources/log4j.properties
>
> incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/resources/simplelog.properties
>
> Modified:
> incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServlet.java
> URL:
> http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServlet.java?rev=750890&r1=750889&r2=750890&view=diff
> ==============================================================================
> ---
> incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServlet.java
> (original)
> +++
> incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ProxyServlet.java
> Fri Mar 6 13:37:42 2009
> @@ -55,13 +55,13 @@
> }
>
> /**
> - * Outputs an error message for the request if it fails.
> - *
> - * TODO: Eliminate this.
> + * Outputs an error message for the request if it fails and if FINE
> logging level.
> */
> private static void outputError(GadgetException e, HttpServletResponse resp)
> throws IOException {
> - LOG.log(Level.INFO, "makeRequest failed", e);
> + if (LOG.isLoggable(Level.FINE)) {
> + LOG.log(Level.FINE, "Make Request failed", e);
> + }
> resp.sendError(HttpServletResponse.SC_BAD_REQUEST, e.getMessage());
> }
> }
>
> Modified:
> incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcServlet.java
> URL:
> http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcServlet.java?rev=750890&r1=750889&r2=750890&view=diff
> ==============================================================================
> ---
> incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcServlet.java
> (original)
> +++
> incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/RpcServlet.java
> Fri Mar 6 13:37:42 2009
> @@ -71,7 +71,13 @@
>
> } catch (IllegalArgumentException e) {
> response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
> - logger.log(Level.INFO, e.getMessage(), e);
> + if (!logger.isLoggable(Level.OFF)) {
> + if (logger.isLoggable(Level.INFO)) {
> + logger.log(Level.INFO, e.getMessage());
> + } else {
> + logger.log(Level.INFO, e.getMessage(), e);
> + }
> + }
This code pattern is strange, for a few reasons:
if logger.isLoggable(Level.INFO) returns false, there's no reason
calling log at Level.INFO. It's a no-op. So kill that branch.
Second, I don't see a reason to check both Level.OFF and Level.INFO -
just check Level.INFO. If Level.OFF is set, isLoggable(Level.INFO)
will return false.
Third, it's a little unusual to bother with checking isLoggable()
unless you're performing significant work within the logging statement
(string concatenation as the usual example). There's none of that
here (unless you had an exception class that had overridden
getMessage(), which is odd.)
Basically, those seven lines can be reduced to:
logger.log(Level.INFO, e.getMessage())
... or just:
logger.info(e.getMessage());
> return;
> }
>
> @@ -129,14 +135,26 @@
> return new Result(resp.toString(), true);
> } catch (UnsupportedEncodingException e) {
> response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
> - logger.log(Level.INFO, e.getMessage(), e);
> + if (!logger.isLoggable(Level.OFF)) {
> + if (logger.isLoggable(Level.INFO)) {
> + logger.log(Level.INFO, e.getMessage());
> + } else {
> + logger.log(Level.INFO, e.getMessage(), e);
> + }
> + }
> return new Result("Unsupported input character set", false);
> } catch (JSONException e) {
> response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
> return new Result("Malformed JSON request.", false);
> } catch (RpcException e) {
> response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
> - logger.log(Level.INFO, e.getMessage(), e);
> + if (!logger.isLoggable(Level.OFF)) {
> + if (logger.isLoggable(Level.INFO)) {
> + logger.log(Level.INFO, e.getMessage());
> + } else {
> + logger.log(Level.INFO, e.getMessage(), e);
> + }
> + }
> return new Result(e.getMessage(), false);
> }
> }
>
> Modified:
> incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthFetcherTest.java
> URL:
> http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthFetcherTest.java?rev=750890&r1=750889&r2=750890&view=diff
> ==============================================================================
> ---
> incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthFetcherTest.java
> (original)
> +++
> incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthFetcherTest.java
> Fri Mar 6 13:37:42 2009
> @@ -57,6 +57,7 @@
> import java.util.List;
> import java.util.Map;
> import java.util.logging.Handler;
> +import java.util.logging.Level;
> import java.util.logging.LogRecord;
> import java.util.logging.Logger;
>
> @@ -68,6 +69,7 @@
> private OAuthFetcherConfig fetcherConfig;
> private FakeOAuthServiceProvider serviceProvider;
> private BasicOAuthStore base;
> + private Logger logger;
> private final List<LogRecord> logRecords = Lists.newArrayList();
> private FakeTimeSource clock = new FakeTimeSource();
>
> @@ -86,7 +88,7 @@
> new DefaultHttpCache(new LruCacheProvider(10)),
> clock);
>
> - Logger logger = Logger.getLogger(OAuthFetcher.class.getName());
> + logger = Logger.getLogger(OAuthFetcher.class.getName());
> logger.addHandler(new Handler() {
> @Override
> public void close() throws SecurityException {
> @@ -225,7 +227,7 @@
> client.getBaseArgs().setSignViewer(true);
> return client;
> }
> -
> +
> /** Client that does OAuth and does not send opensocial_* params */
> private MakeRequestClient makeStrictNonSocialClient(String owner, String
> viewer, String gadget)
> throws Exception {
> @@ -950,44 +952,44 @@
> public void testAccessTokenExpires_onClient() throws Exception {
> serviceProvider.setSessionExtension(true);
> MakeRequestClient client = makeNonSocialClient("owner", "owner",
> GADGET_URL);
> -
> +
> HttpResponse response =
> client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
> assertEquals("", response.getResponseAsString());
> client.approveToken("user_data=hello-oauth");
> -
> +
> response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
> assertEquals("User data is hello-oauth", response.getResponseAsString());
> -
> +
> assertEquals(1, serviceProvider.getRequestTokenCount());
> assertEquals(1, serviceProvider.getAccessTokenCount());
> assertEquals(1, serviceProvider.getResourceAccessCount());
>
> clock.incrementSeconds(FakeOAuthServiceProvider.TOKEN_EXPIRATION_SECONDS
> + 1);
> -
> +
> response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL +
> "?cb=1");
> assertEquals("User data is hello-oauth", response.getResponseAsString());
> -
> +
> assertEquals(1, serviceProvider.getRequestTokenCount());
> assertEquals(2, serviceProvider.getAccessTokenCount());
> assertEquals(2, serviceProvider.getResourceAccessCount());
> -
> +
> response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL +
> "?cb=3");
> assertEquals("User data is hello-oauth", response.getResponseAsString());
>
> assertEquals(1, serviceProvider.getRequestTokenCount());
> assertEquals(2, serviceProvider.getAccessTokenCount());
> assertEquals(3, serviceProvider.getResourceAccessCount());
> -
> +
> clock.incrementSeconds(FakeOAuthServiceProvider.TOKEN_EXPIRATION_SECONDS
> + 1);
> -
> +
> response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL +
> "?cb=4");
> assertEquals("User data is hello-oauth", response.getResponseAsString());
> -
> +
> assertEquals(1, serviceProvider.getRequestTokenCount());
> assertEquals(3, serviceProvider.getAccessTokenCount());
> assertEquals(4, serviceProvider.getResourceAccessCount());
> }
> -
> +
> // Tests the case where the server doesn't tell us when the token will
> expire. This requires
> // an extra round trip to discover that the token has expired.
> @Test
> @@ -995,111 +997,111 @@
> serviceProvider.setSessionExtension(true);
> serviceProvider.setReportExpirationTimes(false);
> MakeRequestClient client = makeNonSocialClient("owner", "owner",
> GADGET_URL);
> -
> +
> HttpResponse response =
> client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
> assertEquals("", response.getResponseAsString());
> client.approveToken("user_data=hello-oauth");
> -
> +
> response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
> assertEquals("User data is hello-oauth", response.getResponseAsString());
> -
> +
> assertEquals(1, serviceProvider.getRequestTokenCount());
> assertEquals(1, serviceProvider.getAccessTokenCount());
> assertEquals(1, serviceProvider.getResourceAccessCount());
>
> clock.incrementSeconds(FakeOAuthServiceProvider.TOKEN_EXPIRATION_SECONDS
> + 1);
> -
> +
> response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL +
> "?cb=1");
> assertEquals("User data is hello-oauth", response.getResponseAsString());
> -
> +
> assertEquals(1, serviceProvider.getRequestTokenCount());
> assertEquals(2, serviceProvider.getAccessTokenCount());
> assertEquals(3, serviceProvider.getResourceAccessCount());
> -
> +
> response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL +
> "?cb=3");
> assertEquals("User data is hello-oauth", response.getResponseAsString());
>
> assertEquals(1, serviceProvider.getRequestTokenCount());
> assertEquals(2, serviceProvider.getAccessTokenCount());
> assertEquals(4, serviceProvider.getResourceAccessCount());
> -
> +
> clock.incrementSeconds(FakeOAuthServiceProvider.TOKEN_EXPIRATION_SECONDS
> + 1);
> -
> +
> response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL +
> "?cb=4");
> assertEquals("User data is hello-oauth", response.getResponseAsString());
> -
> +
> assertEquals(1, serviceProvider.getRequestTokenCount());
> assertEquals(3, serviceProvider.getAccessTokenCount());
> assertEquals(6, serviceProvider.getResourceAccessCount());
> }
> -
> +
> @Test
> public void testAccessTokenExpires_onServer() throws Exception {
> serviceProvider.setSessionExtension(true);
> MakeRequestClient client = makeNonSocialClient("owner", "owner",
> GADGET_URL);
> -
> +
> HttpResponse response =
> client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
> assertEquals("", response.getResponseAsString());
> client.approveToken("user_data=hello-oauth");
> -
> +
> response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
> assertEquals("User data is hello-oauth", response.getResponseAsString());
> assertEquals(1, serviceProvider.getRequestTokenCount());
> assertEquals(1, serviceProvider.getAccessTokenCount());
> assertEquals(1, serviceProvider.getResourceAccessCount());
> -
> +
> // clears oauthState
> client = makeNonSocialClient("owner", "owner", GADGET_URL);
>
> clock.incrementSeconds(FakeOAuthServiceProvider.TOKEN_EXPIRATION_SECONDS
> + 1);
> -
> +
> response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL +
> "?cb=1");
> assertEquals("User data is hello-oauth", response.getResponseAsString());
> -
> +
> assertEquals(1, serviceProvider.getRequestTokenCount());
> assertEquals(2, serviceProvider.getAccessTokenCount());
> assertEquals(2, serviceProvider.getResourceAccessCount());
> }
> -
> +
> @Test
> public void testAccessTokenExpired_andRevoked() throws Exception {
> serviceProvider.setSessionExtension(true);
> MakeRequestClient client = makeNonSocialClient("owner", "owner",
> GADGET_URL);
> -
> +
> HttpResponse response =
> client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
> assertEquals("", response.getResponseAsString());
> client.approveToken("user_data=hello-oauth");
> -
> +
> response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
> assertEquals("User data is hello-oauth", response.getResponseAsString());
>
> assertEquals(1, serviceProvider.getRequestTokenCount());
> assertEquals(1, serviceProvider.getAccessTokenCount());
> assertEquals(1, serviceProvider.getResourceAccessCount());
> -
> +
> clock.incrementSeconds(FakeOAuthServiceProvider.TOKEN_EXPIRATION_SECONDS
> + 1);
> serviceProvider.revokeAllAccessTokens();
> -
> +
> response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL +
> "?cb=1");
> assertEquals("", response.getResponseAsString());
> assertEquals(2, serviceProvider.getRequestTokenCount());
> assertEquals(2, serviceProvider.getAccessTokenCount());
> assertEquals(1, serviceProvider.getResourceAccessCount());
> -
> +
> client.approveToken("user_data=renewed");
> -
> +
> response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL +
> "?cb=1");
> assertEquals(2, serviceProvider.getRequestTokenCount());
> assertEquals(3, serviceProvider.getAccessTokenCount());
> assertEquals(2, serviceProvider.getResourceAccessCount());
> assertEquals("User data is renewed", response.getResponseAsString());
> }
> -
> +
> @Test
> public void testBadSessionHandle() throws Exception {
> serviceProvider.setSessionExtension(true);
> MakeRequestClient client = makeNonSocialClient("owner", "owner",
> GADGET_URL);
> -
> +
> HttpResponse response =
> client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
> assertEquals("", response.getResponseAsString());
> client.approveToken("user_data=hello-oauth");
> @@ -1110,7 +1112,7 @@
> assertEquals(1, serviceProvider.getRequestTokenCount());
> assertEquals(1, serviceProvider.getAccessTokenCount());
> assertEquals(1, serviceProvider.getResourceAccessCount());
> -
> +
> clock.incrementSeconds(FakeOAuthServiceProvider.TOKEN_EXPIRATION_SECONDS
> + 1);
> serviceProvider.changeAllSessionHandles();
>
> @@ -1119,30 +1121,30 @@
> assertEquals(2, serviceProvider.getRequestTokenCount());
> assertEquals(2, serviceProvider.getAccessTokenCount());
> assertEquals(1, serviceProvider.getResourceAccessCount());
> -
> +
> client.approveToken("user_data=renewed");
> -
> +
> response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL +
> "?cb=1");
> assertEquals(2, serviceProvider.getRequestTokenCount());
> assertEquals(3, serviceProvider.getAccessTokenCount());
> assertEquals(2, serviceProvider.getResourceAccessCount());
> assertEquals("User data is renewed", response.getResponseAsString());
> }
> -
> +
> @Test
> public void testExtraParamsRejected() throws Exception {
> serviceProvider.setRejectExtraParams(true);
> MakeRequestClient client = makeNonSocialClient("owner", "owner",
> GADGET_URL);
> -
> +
> HttpResponse response =
> client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
> assertEquals("parameter_rejected",
> response.getMetadata().get("oauthError"));
> }
> -
> +
> @Test
> public void testExtraParamsSuppressed() throws Exception {
> serviceProvider.setRejectExtraParams(true);
> MakeRequestClient client = makeStrictNonSocialClient("owner", "owner",
> GADGET_URL);
> -
> +
> HttpResponse response =
> client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
> assertEquals("", response.getResponseAsString());
> client.approveToken("user_data=hello-oauth");
> @@ -1150,11 +1152,11 @@
> response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
> assertEquals("User data is hello-oauth", response.getResponseAsString());
> }
> -
> +
> @Test
> public void testCanRetrieveAccessTokenData() throws Exception {
> serviceProvider.setReturnAccessTokenData(true);
> -
> +
> MakeRequestClient client = makeNonSocialClient("owner", "owner",
> GADGET_URL);
>
> HttpResponse response =
> client.sendGet(FakeOAuthServiceProvider.ACCESS_TOKEN_URL);
> @@ -1166,7 +1168,7 @@
> JSONObject json = new JSONObject(response.getResponseAsString());
> assertEquals("userid value", json.get("userid"));
> assertEquals("xoauth_stuff value", json.get("xoauth_stuff"));
> -
> +
> response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
> assertEquals("User data is hello-oauth", response.getResponseAsString());
> }
> @@ -1174,7 +1176,7 @@
> @Test
> public void testAccessTokenData_noOAuthParams() throws Exception {
> serviceProvider.setReturnAccessTokenData(true);
> -
> +
> MakeRequestClient client = makeNonSocialClient("owner", "owner",
> GADGET_URL);
>
> HttpResponse response =
> client.sendGet(FakeOAuthServiceProvider.ACCESS_TOKEN_URL);
> @@ -1186,7 +1188,7 @@
> assertEquals("userid value", json.get("userid"));
> assertEquals("xoauth_stuff value", json.get("xoauth_stuff"));
> assertEquals(2, json.length());
> -
> +
> response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
> assertEquals("User data is hello-oauth", response.getResponseAsString());
> }
> @@ -1194,16 +1196,16 @@
> @Test
> public void testAccessTokenData_noDirectRequest() throws Exception {
> serviceProvider.setReturnAccessTokenData(true);
> -
> +
> MakeRequestClient client = makeNonSocialClient("owner", "owner",
> GADGET_URL);
>
> HttpResponse response =
> client.sendGet(FakeOAuthServiceProvider.ACCESS_TOKEN_URL);
> assertEquals("", response.getResponseAsString());
> client.approveToken("user_data=hello-oauth");
> -
> +
> response = client.sendGet(FakeOAuthServiceProvider.RESOURCE_URL);
> assertEquals("User data is hello-oauth", response.getResponseAsString());
> -
> +
> response = client.sendGet(FakeOAuthServiceProvider.ACCESS_TOKEN_URL);
> assertEquals("", response.getResponseAsString());
> assertTrue(response.getMetadata().containsKey("oauthApprovalUrl"));
> @@ -1229,6 +1231,9 @@
> }
>
> private void checkLogContains(String text) {
> + if ((logger.getLevel()!=null)&&(logger.getLevel().equals(Level.OFF))) {
> + return;
> + }
> String logText = getLogText();
> if (!logText.contains(text)) {
> fail("Should have logged '" + text + "', instead got " + logText);
>
> Added:
> incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/resources/logging.properties
> URL:
> http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/resources/logging.properties?rev=750890&view=auto
> ==============================================================================
> ---
> incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/resources/logging.properties
> (added)
> +++
> incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/resources/logging.properties
> Fri Mar 6 13:37:42 2009
> @@ -0,0 +1,41 @@
> +# Licensed to the Apache Software Foundation (ASF) under one
> +# or more contributor license agreements. See the NOTICE file
> +# distributed with this work for additional information
> +# regarding copyright ownership. The ASF licenses this file
> +# to you under the Apache License, Version 2.0 (the
> +# "License"); you may not use this file except in compliance
> +# with the License. You may obtain a copy of the License at
> +#
> +# http://www.apache.org/licenses/LICENSE-2.0
> +#
> +# Unless required by applicable law or agreed to in writing,
> +# software distributed under the License is distributed on an
> +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> +# KIND, either express or implied. See the License for the
> +# specific language governing permissions and limitations
> +# under the License.
> +
> +handlers=java.util.logging.ConsoleHandler
> +java.util.logging.ConsoleHandler.level=ALL
> +java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
> +.level=INFO
> +
> +# Shindig commons
> +org.apache.shindig.common.cache.LruCacheProvider.level=${java.util.logging.test.level}
> +
> +# Shindig gadgets
> +org.apache.shindig.gadgets.level=${java.util.logging.test.level}
> +org.apache.shindig.gadgets.DefaultGadgetSpecFactory.level=${java.util.logging.test.level}
> +org.apache.shindig.gadgets.DefaultMessageBundleFactory.level=${java.util.logging.test.level}
> +org.apache.shindig.gadgets.GadgetFeatureRegistry.level=${java.util.logging.test.level}
> +org.apache.shindig.gadgets.HashLockedDomainService.level=${java.util.logging.test.level}
> +org.apache.shindig.gadgets.JsLibrary.level=${java.util.logging.test.level}
> +org.apache.shindig.gadgets.JsFeatureLoader.level=${java.util.logging.test.level}
> +org.apache.shindig.gadgets.oauth.OAuthFetcher.level=${java.util.logging.test.level}
> +org.apache.shindig.gadgets.process.Processor.level=${java.util.logging.test.level}
> +org.apache.shindig.gadgets.render.HtmlRenderer.level=${java.util.logging.test.level}
> +org.apache.shindig.gadgets.render.Renderer.level=${java.util.logging.test.level}
> +org.apache.shindig.gadgets.render.RenderingContentRewriter.level=${java.util.logging.test.level}
> +org.apache.shindig.gadgets.servlet.MakeRequestServlet.level=${java.util.logging.test.level}
> +org.apache.shindig.gadgets.servlet.RpcServlet.level=${java.util.logging.test.level}
> +org.apache.shindig.gadgets.servlet.ProxyHandler.level=${java.util.logging.test.level}
>
> Propchange:
> incubator/shindig/branches/1.0.x-incubating/java/gadgets/src/test/resources/logging.properties
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Modified: incubator/shindig/branches/1.0.x-incubating/java/pom.xml
> URL:
> http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/pom.xml?rev=750890&r1=750889&r2=750890&view=diff
> ==============================================================================
> --- incubator/shindig/branches/1.0.x-incubating/java/pom.xml (original)
> +++ incubator/shindig/branches/1.0.x-incubating/java/pom.xml Fri Mar 6
> 13:37:42 2009
> @@ -44,4 +44,39 @@
>
> <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/shindig/branches/1.0.x-incubating/java</developerConnection>
>
> <url>http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java</url>
> </scm>
> +
> + <properties>
> + <java.util.logging.test.level>OFF</java.util.logging.test.level>
> + </properties>
> +
> + <build>
> + <plugins>
> + <plugin>
> + <groupId>org.apache.maven.plugins</groupId>
> + <artifactId>maven-surefire-plugin</artifactId>
> + <configuration>
> + <systemProperties>
> + <property>
> + <name>java.util.logging.config.file</name>
> + <value>target/test-classes/logging.properties</value>
> + </property>
> + </systemProperties>
> + </configuration>
> + </plugin>
> + </plugins>
> +
> + <testResources>
> + <testResource>
> + <directory>src/test/resources</directory>
> + <filtering>false</filtering>
> + </testResource>
> + <testResource>
> + <directory>src/test/resources</directory>
> + <includes>
> + <include>logging.properties</include>
> + </includes>
> + <filtering>true</filtering>
> + </testResource>
> + </testResources>
> + </build>
> </project>
>
> Modified:
> incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/resources/log4j.properties
> URL:
> http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/resources/log4j.properties?rev=750890&r1=750889&r2=750890&view=diff
> ==============================================================================
> ---
> incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/resources/log4j.properties
> (original)
> +++
> incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/resources/log4j.properties
> Fri Mar 6 13:37:42 2009
> @@ -1,8 +1,23 @@
> +# Licensed to the Apache Software Foundation (ASF) under one
> +# or more contributor license agreements. See the NOTICE file
> +# distributed with this work for additional information
> +# regarding copyright ownership. The ASF licenses this file
> +# to you under the Apache License, Version 2.0 (the
> +# "License"); you may not use this file except in compliance
> +# with the License. You may obtain a copy of the License at
> +#
> +# http://www.apache.org/licenses/LICENSE-2.0
> +#
> +# Unless required by applicable law or agreed to in writing,
> +# software distributed under the License is distributed on an
> +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> +# KIND, either express or implied. See the License for the
> +# specific language governing permissions and limitations
> +# under the License.
> +
> log4j.rootCategory=info
> log4j.rootLogger=info, stdout
>
> -
> log4j.appender.stdout=org.apache.log4j.ConsoleAppender
> log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
> log4j.appender.stdout.layout.ConversionPattern= %p %m [%d] (%F:%L) %n
> -
>
> Added:
> incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/resources/logging.properties
> URL:
> http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/resources/logging.properties?rev=750890&view=auto
> ==============================================================================
> ---
> incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/resources/logging.properties
> (added)
> +++
> incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/resources/logging.properties
> Fri Mar 6 13:37:42 2009
> @@ -0,0 +1,27 @@
> +# Licensed to the Apache Software Foundation (ASF) under one
> +# or more contributor license agreements. See the NOTICE file
> +# distributed with this work for additional information
> +# regarding copyright ownership. The ASF licenses this file
> +# to you under the Apache License, Version 2.0 (the
> +# "License"); you may not use this file except in compliance
> +# with the License. You may obtain a copy of the License at
> +#
> +# http://www.apache.org/licenses/LICENSE-2.0
> +#
> +# Unless required by applicable law or agreed to in writing,
> +# software distributed under the License is distributed on an
> +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> +# KIND, either express or implied. See the License for the
> +# specific language governing permissions and limitations
> +# under the License.
> +
> +handlers=java.util.logging.ConsoleHandler
> +java.util.logging.ConsoleHandler.level=ALL
> +java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
> +.level=INFO
> +
> +# Shindig commons
> +org.apache.shindig.common.JsonContainerConfig.level=${java.util.logging.test.level}
> +org.apache.shindig.common.xml.XmlUtil.level=${java.util.logging.test.level}
> +org.apache.shindig.social.opensocial.util.ApiValidator.level=${java.util.logging.test.level}
> +org.apache.shindig.social.core.util.JsonLibConverterUtils.level=${java.util.logging.test.level}
>
> Propchange:
> incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/resources/logging.properties
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Modified:
> incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/resources/simplelog.properties
> URL:
> http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/resources/simplelog.properties?rev=750890&r1=750889&r2=750890&view=diff
> ==============================================================================
> ---
> incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/resources/simplelog.properties
> (original)
> +++
> incubator/shindig/branches/1.0.x-incubating/java/social-api/src/test/resources/simplelog.properties
> Fri Mar 6 13:37:42 2009
> @@ -1,8 +1,23 @@
> +# Licensed to the Apache Software Foundation (ASF) under one
> +# or more contributor license agreements. See the NOTICE file
> +# distributed with this work for additional information
> +# regarding copyright ownership. The ASF licenses this file
> +# to you under the Apache License, Version 2.0 (the
> +# "License"); you may not use this file except in compliance
> +# with the License. You may obtain a copy of the License at
> +#
> +# http://www.apache.org/licenses/LICENSE-2.0
> +#
> +# Unless required by applicable law or agreed to in writing,
> +# software distributed under the License is distributed on an
> +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
> +# KIND, either express or implied. See the License for the
> +# specific language governing permissions and limitations
> +# under the License.
> +
> log4j.rootCategory=info
> log4j.rootLogger=info, stdout
>
> -
> log4j.appender.stdout=org.apache.log4j.ConsoleAppender
> log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
> log4j.appender.stdout.layout.ConversionPattern= %p %m [%d] (%F:%L) %n
> -
>
>
>
