You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2011/06/19 16:25:12 UTC
svn commit: r1137371 - in /openejb/trunk/sandbox/tools/src:
main/java/org/apache/openejb/tools/
main/java/org/apache/openejb/tools/examples/
main/java/org/apache/openejb/tools/twitter/
main/java/org/apache/openejb/tools/twitter/util/ main/resources/gen...
Author: rmannibucau
Date: Sun Jun 19 14:25:11 2011
New Revision: 1137371
URL: http://svn.apache.org/viewvc?rev=1137371&view=rev
Log:
extracting properties in a file
Added:
openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/ExamplesPropertiesManager.java
Modified:
openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/Daily.java
openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/FileHelper.java
openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/GenerateIndex.java
openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/OpenEJBTemplate.java
openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/ViewHelper.java
openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/ZipHelper.java
openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/twitter/AccessTokenGenerator.java
openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/twitter/AuthorizationUrlGenerator.java
openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/twitter/JsonResponseParser.java
openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/twitter/OpenEJBMessageFilterUtil.java
openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/twitter/Retweet.java
openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/twitter/ScreenNamesRetriever.java
openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/twitter/UserStatusRetriever.java
openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/twitter/util/RetweetAppUtil.java
openejb/trunk/sandbox/tools/src/main/resources/generate-index/config.properties
openejb/trunk/sandbox/tools/src/test/java/org/apache/openejb/tools/RetweetITest.java
Modified: openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/Daily.java
URL: http://svn.apache.org/viewvc/openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/Daily.java?rev=1137371&r1=1137370&r2=1137371&view=diff
==============================================================================
--- openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/Daily.java (original)
+++ openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/Daily.java Sun Jun 19 14:25:11 2011
@@ -16,6 +16,7 @@
*/
package org.apache.openejb.tools;
+import org.apache.openejb.tools.examples.ExamplesPropertiesManager;
import org.apache.openejb.tools.examples.GenerateIndex;
/**
@@ -29,10 +30,9 @@ import org.apache.openejb.tools.examples
* @version $Rev$ $Date$
*/
public class Daily {
- private static final String EXAMPLE_ZIP_LOCATION = "/tmp/examples.zip";
- private static final String EXAMPLE_WORKING_FOLDER = "/tmp/openejb";
-
public static void main(String[] args) {
- GenerateIndex.generate(EXAMPLE_ZIP_LOCATION, EXAMPLE_WORKING_FOLDER);
+ GenerateIndex.generate(
+ ExamplesPropertiesManager.get().getProperty("examples.zip"),
+ ExamplesPropertiesManager.get().getProperty("examples.working"));
}
}
Added: openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/ExamplesPropertiesManager.java
URL: http://svn.apache.org/viewvc/openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/ExamplesPropertiesManager.java?rev=1137371&view=auto
==============================================================================
--- openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/ExamplesPropertiesManager.java (added)
+++ openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/ExamplesPropertiesManager.java Sun Jun 19 14:25:11 2011
@@ -0,0 +1,32 @@
+package org.apache.openejb.tools.examples;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.Properties;
+import org.apache.log4j.Logger;
+
+/**
+ * @author Romain Manni-Bucau
+ */
+public final class ExamplesPropertiesManager {
+ private static final Logger LOGGER = Logger.getLogger(ExamplesPropertiesManager.class);
+ private static final String TEMPLATE_COMMON_PROPERTIES = "generate-index/config.properties";
+ private static final Properties PROPERTIES = new Properties();
+
+ static {
+ URL propertiesUrl = Thread.currentThread().getContextClassLoader().getResource(TEMPLATE_COMMON_PROPERTIES);
+ try {
+ PROPERTIES.load(propertiesUrl.openStream());
+ } catch (IOException e) {
+ LOGGER.error("can't read common properties, please put a " + TEMPLATE_COMMON_PROPERTIES + " file");
+ }
+ }
+
+ private ExamplesPropertiesManager() {
+ // no-op
+ }
+
+ public static Properties get() {
+ return PROPERTIES;
+ }
+}
Modified: openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/FileHelper.java
URL: http://svn.apache.org/viewvc/openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/FileHelper.java?rev=1137371&r1=1137370&r2=1137371&view=diff
==============================================================================
--- openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/FileHelper.java (original)
+++ openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/FileHelper.java Sun Jun 19 14:25:11 2011
@@ -1,25 +1,21 @@
package org.apache.openejb.tools.examples;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
import org.apache.log4j.Logger;
/**
* @author Romain Manni-Bucau
*/
public final class FileHelper {
- public static final List<String> EXCLUDED_FOLDERS = ListBuilder.newList(String.class)
- .add("examples").add(".svn").add("target").add(".git").add(".settings")
- .list();
-
private static final Logger LOGGER = Logger.getLogger(FileHelper.class);
+ public static final List<String> EXCLUDED_FOLDERS = Arrays.asList(
+ ExamplesPropertiesManager.get().getProperty("excluded").split(","));
+
private FileHelper() {
// no-op
}
Modified: openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/GenerateIndex.java
URL: http://svn.apache.org/viewvc/openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/GenerateIndex.java?rev=1137371&r1=1137370&r2=1137371&view=diff
==============================================================================
--- openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/GenerateIndex.java (original)
+++ openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/GenerateIndex.java Sun Jun 19 14:25:11 2011
@@ -19,7 +19,6 @@ package org.apache.openejb.tools.example
import com.petebevin.markdown.MarkdownProcessor;
import java.io.File;
import java.io.IOException;
-import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -71,25 +70,9 @@ import static org.apache.openejb.tools.e
*/
public class GenerateIndex {
private static final Logger LOGGER = Logger.getLogger(GenerateIndex.class);
-
- public static final String EXTRACTED_EXAMPLES = "extracted";
- public static final String GENERATED_EXAMPLES = "generated";
- public static final String INDEX_HTML = "index.html";
- public static final String GLOSSARY_HTML = "glossary.html";
- public static final String README_MD = "README.md";
-
- public static final String POM_XML = "pom.xml";
-
private static final MarkdownProcessor PROCESSOR = new MarkdownProcessor();
- private static final String TEMPLATE_COMMON_PROPERTIES = "generate-index/config.properties";
- private static final String MAIN_TEMPLATE = "index.vm";
- private static final String CODE_TEMPLATE = "code.vm";
- private static final String DEFAULT_EXAMPLE_TEMPLATE = "example.vm";
- private static final String EXTERNALE_TEMPLATE = "external.vm";
-
- private static final String GLOSSARY_TEMPLATE = "glossary.vm";
- private static final String TITLE = "title";
- private static final String BASE = "base";
+ private static final String BASE_VAR = ExamplesPropertiesManager.get().getProperty("template.var.base");
+ private static final String TITLE_VAR = ExamplesPropertiesManager.get().getProperty("template.var.title");
/**
* Can be run in an IDE or via Maven like so:
@@ -100,20 +83,14 @@ public class GenerateIndex {
* @param workFolder work folder
*/
public static void generate(String examplesZip, String workFolder) {
- Properties properties = new Properties();
- URL propertiesUrl = Thread.currentThread().getContextClassLoader().getResource(TEMPLATE_COMMON_PROPERTIES);
- try {
- properties.load(propertiesUrl.openStream());
- } catch (IOException e) {
- LOGGER.error("can't read common properties, please put a " + TEMPLATE_COMMON_PROPERTIES + " file");
- }
+ Properties properties = ExamplesPropertiesManager.get();
// will be used everywhere so keep it here
- String base = properties.getProperty(BASE);
+ String base = properties.getProperty("base");
// working folder
- File extractedDir = new File(workFolder, EXTRACTED_EXAMPLES);
- File generatedDir = new File(workFolder, GENERATED_EXAMPLES);
+ File extractedDir = new File(workFolder, properties.getProperty("extracted"));
+ File generatedDir = new File(workFolder, properties.getProperty("generated"));
// crack open the examples zip file
extract(examplesZip, extractedDir.getPath());
@@ -122,13 +99,13 @@ public class GenerateIndex {
Map<String, Set<String>> exampleLinksByKeyword = new TreeMap<String, Set<String>>();
Map<String, String> nameByLink = new TreeMap<String, String>();
Map<String, String> zipLinks = new TreeMap<String, String>();
- Collection<File> examples = listFolders(extractedDir, POM_XML);
+ Collection<File> examples = listFolders(extractedDir, properties.getProperty("pom"));
for (File example : examples) {
// create a directory for each example
File generated = new File(generatedDir, example.getPath().replace(extractedDir.getPath(), ""));
mkdirp(generated);
- File readme = new File(example, README_MD);
+ File readme = new File(example, properties.getProperty("readme"));
String html = "";
if (readme.exists()) {
try {
@@ -138,7 +115,7 @@ public class GenerateIndex {
}
}
- File index = new File(generated, INDEX_HTML);
+ File index = new File(generated, properties.getProperty("index"));
String link = getLink(generatedDir, index);
nameByLink.put(link, example.getName());
@@ -167,10 +144,10 @@ public class GenerateIndex {
File sourceFile = new File(generated, source);
mkdirp(sourceFile.getParentFile());
- tpl(CODE_TEMPLATE,
+ tpl(properties.getProperty("template.code"),
newMap(String.class, Object.class)
- .add(TITLE, source + " source")
- .add(BASE, base)
+ .add(TITLE_VAR, source + " source")
+ .add(BASE_VAR, base)
.add(OpenEJBTemplate.USER_JAVASCRIPTS, newList(String.class).add("prettyprint.js").list())
.add("file", source)
.add("code", code)
@@ -179,12 +156,12 @@ public class GenerateIndex {
}
if (html.isEmpty()) {
- LOGGER.warn("no " + README_MD + " for example " + example.getName() + " [" + example.getPath() + "]");
+ LOGGER.warn("no readme for example " + example.getName() + " [" + example.getPath() + "]");
- tpl(DEFAULT_EXAMPLE_TEMPLATE,
+ tpl(properties.getProperty("template.default"),
newMap(String.class, Object.class)
- .add(TITLE, example.getName() + " example")
- .add(BASE, base)
+ .add(TITLE_VAR, example.getName() + " example")
+ .add(BASE_VAR, base)
.add(OpenEJBTemplate.USER_JAVASCRIPTS, newList(String.class).add("prettyprint.js").list())
.add("apis", apiCount)
.add("link", zip.getName())
@@ -192,10 +169,10 @@ public class GenerateIndex {
.map(),
index.getPath());
} else {
- tpl(EXTERNALE_TEMPLATE,
+ tpl(properties.getProperty("template.external"),
newMap(String.class, Object.class)
- .add(TITLE, example.getName() + " example")
- .add(BASE, base)
+ .add(TITLE_VAR, example.getName() + " example")
+ .add(BASE_VAR, base)
.add(OpenEJBTemplate.USER_JAVASCRIPTS, newList(String.class).add("prettyprint.js").list())
.add("content", html)
.map(),
@@ -208,10 +185,10 @@ public class GenerateIndex {
Map<String, String> aggregatedClasses = getAggregateClasses(new ArrayList<String>(nameByLink.keySet()), exampleLinksByKeyword);
// create a glossary page (OR search)
- tpl(GLOSSARY_TEMPLATE,
+ tpl(properties.getProperty("template.glossary"),
newMap(String.class, Object.class)
- .add(TITLE, "OpenEJB Example Glossary")
- .add(BASE, base)
+ .add(TITLE_VAR, "OpenEJB Example Glossary")
+ .add(BASE_VAR, base)
.add(USER_JAVASCRIPTS, newList(String.class).add("glossary.js").list())
.add("links", nameByLink)
.add("zipLinks", zipLinks)
@@ -220,13 +197,13 @@ public class GenerateIndex {
.add("exampleByKeyword", exampleLinksByKeyword)
.add("aggregatedClasses", aggregatedClasses)
.map(),
- new File(generatedDir, GLOSSARY_HTML).getPath());
+ new File(generatedDir, properties.getProperty("glossary")).getPath());
// create an index for all example directories
- tpl(MAIN_TEMPLATE,
+ tpl(properties.getProperty("template.main"),
newMap(String.class, Object.class)
- .add(TITLE, "OpenEJB Example")
- .add(BASE, base)
+ .add(TITLE_VAR, "OpenEJB Example")
+ .add(BASE_VAR, base)
.add(USER_JAVASCRIPTS, newList(String.class).add("index.js").list())
.add("zipLinks", zipLinks)
.add("examples", nameByLink)
@@ -234,7 +211,7 @@ public class GenerateIndex {
.add("examplesClasses", examplesClassesByApi)
.add("aggregatedClasses", aggregatedClasses)
.map(),
- new File(generatedDir, INDEX_HTML).getPath());
+ new File(generatedDir, properties.getProperty("index")).getPath());
}
// just a shortcut
Modified: openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/OpenEJBTemplate.java
URL: http://svn.apache.org/viewvc/openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/OpenEJBTemplate.java?rev=1137371&r1=1137370&r2=1137371&view=diff
==============================================================================
--- openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/OpenEJBTemplate.java (original)
+++ openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/OpenEJBTemplate.java Sun Jun 19 14:25:11 2011
@@ -19,12 +19,13 @@ import org.apache.velocity.runtime.log.C
public final class OpenEJBTemplate {
private static final Logger LOGGER = Logger.getLogger(OpenEJBTemplate.class);
- public static final String USER_JAVASCRIPTS = "javascripts";
- public static final String USER_CSS = "css";
-
private static final OpenEJBTemplate INSTANCE = new OpenEJBTemplate();
private static final String LOG_TAG = OpenEJBTemplate.class.getName();
- private static final String PREFIX = "generate-index/velocity/";
+ private static final String BASE = ExamplesPropertiesManager.get().getProperty("velocity");
+
+ // to be used by others classes
+ public static final String USER_JAVASCRIPTS = ExamplesPropertiesManager.get().getProperty("javascripts");
+ public static final String USER_CSS = ExamplesPropertiesManager.get().getProperty("css");
private VelocityEngine engine;
private Map<String, URL> resources = new HashMap<String, URL>();
@@ -56,7 +57,7 @@ public final class OpenEJBTemplate {
}
if (!resources.containsKey(template)) {
- URL resource = Thread.currentThread().getContextClassLoader().getResource(PREFIX + template);
+ URL resource = Thread.currentThread().getContextClassLoader().getResource(BASE + template);
resources.put(template, resource);
}
Modified: openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/ViewHelper.java
URL: http://svn.apache.org/viewvc/openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/ViewHelper.java?rev=1137371&r1=1137370&r2=1137371&view=diff
==============================================================================
--- openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/ViewHelper.java (original)
+++ openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/ViewHelper.java Sun Jun 19 14:25:11 2011
@@ -5,6 +5,7 @@ import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -23,8 +24,9 @@ public final class ViewHelper {
public static final char REPLACED_CHAR = '_';
- private static final String JAVAX_PREFIX = "javax.";
- private static final String IMPORT_START = "import ";
+ private static final List<String> JAVAX_PREFIX = Arrays.asList(
+ ExamplesPropertiesManager.get().getProperty("api.filtering").split(","));
+ private static final String IMPORT_START = ExamplesPropertiesManager.get().getProperty("api.import");
private ViewHelper() {
// no-op
@@ -40,10 +42,11 @@ public final class ViewHelper {
public static Map<String, String> getExamplesClassesByApi(Map<String, Set<String>> exampleLinksByKeyword) {
Map<String, String> classes = new TreeMap<String, String>();
+ String index = ExamplesPropertiesManager.get().getProperty("index");
for (Entry<String, Set<String>> entry : exampleLinksByKeyword.entrySet()) {
Set<String> examples = new HashSet<String>();
for (String example : entry.getValue()) {
- examples.add(example.substring(0, example.length() - GenerateIndex.INDEX_HTML.length() - 1));
+ examples.add(example.substring(0, example.length() - index.length() - 1));
}
classes.put(entry.getKey(), concatHTMLClasses(examples, "button", '/', REPLACED_CHAR));
}
@@ -58,14 +61,6 @@ public final class ViewHelper {
return classes;
}
- public static List<String> removePrefix(File path, List<File> files) {
- List<String> processed = new ArrayList<String>();
- for (File file : files) {
- processed.add(getLink(path, file));
- }
- return processed;
- }
-
public static List<String> startFromPrefix(String prefix, List<File> files) {
List<String> processed = new ArrayList<String>();
for (File file : files) {
@@ -83,16 +78,19 @@ public final class ViewHelper {
Set<String> imports = getImports(file);
if (imports != null) {
for (String name : imports) {
- if (name.startsWith(JAVAX_PREFIX)) {
+ name = name.trim();
+
+ if (matches(name)) {
if (!exampleLinksByKeyword.containsKey(name)) {
exampleLinksByKeyword.put(name, new HashSet<String>());
}
exampleLinksByKeyword.get(name).add(getLink(generatedDir, index));
- }
- if (!apiCount.containsKey(name)) {
- apiCount.put(name, 1);
- } else {
- apiCount.put(name, apiCount.get(name) + 1);
+
+ if (!apiCount.containsKey(name)) {
+ apiCount.put(name, 1);
+ } else {
+ apiCount.put(name, apiCount.get(name) + 1);
+ }
}
}
}
@@ -103,6 +101,15 @@ public final class ViewHelper {
return apiCount;
}
+ private static boolean matches(String name) {
+ for (String api : JAVAX_PREFIX) {
+ if (name.startsWith(api)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
private static String concatHTMLClasses(Set<String> values, String defaultClass, char toReplace, char replaced) {
StringBuilder htmlClass = new StringBuilder(defaultClass);
for (String value : values) {
Modified: openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/ZipHelper.java
URL: http://svn.apache.org/viewvc/openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/ZipHelper.java?rev=1137371&r1=1137370&r2=1137371&view=diff
==============================================================================
--- openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/ZipHelper.java (original)
+++ openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/examples/ZipHelper.java Sun Jun 19 14:25:11 2011
@@ -16,7 +16,7 @@ import static org.apache.openejb.tools.e
*/
public final class ZipHelper {
private static final Logger LOGGER = Logger.getLogger(ZipHelper.class);
- private static final int BUFFER_SIZE = 1024;
+ private static final int BUFFER_SIZE = Integer.parseInt(ExamplesPropertiesManager.get().getProperty("zip.buffer"));
private ZipHelper() {
// no-op
@@ -59,8 +59,8 @@ public final class ZipHelper {
String[] entries = dir.list();
ZipOutputStream out = new ZipOutputStream(new FileOutputStream(zipName));
- for (int i = 0; i < entries.length; i++) {
- File f = new File(dir, entries[i]);
+ for (String entry : entries) {
+ File f = new File(dir, entry);
zipFile(out, f, skip);
}
out.close();
Modified: openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/twitter/AccessTokenGenerator.java
URL: http://svn.apache.org/viewvc/openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/twitter/AccessTokenGenerator.java?rev=1137371&r1=1137370&r2=1137371&view=diff
==============================================================================
--- openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/twitter/AccessTokenGenerator.java (original)
+++ openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/twitter/AccessTokenGenerator.java Sun Jun 19 14:25:11 2011
@@ -16,13 +16,12 @@
*/
package org.apache.openejb.tools.twitter;
+import java.util.Scanner;
import oauth.signpost.exception.OAuthCommunicationException;
import oauth.signpost.exception.OAuthExpectationFailedException;
import oauth.signpost.exception.OAuthMessageSignerException;
import oauth.signpost.exception.OAuthNotAuthorizedException;
-import java.util.Scanner;
-
import static org.apache.openejb.tools.twitter.AuthorizationUrlGenerator.consumer;
import static org.apache.openejb.tools.twitter.AuthorizationUrlGenerator.provider;
Modified: openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/twitter/AuthorizationUrlGenerator.java
URL: http://svn.apache.org/viewvc/openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/twitter/AuthorizationUrlGenerator.java?rev=1137371&r1=1137370&r2=1137371&view=diff
==============================================================================
--- openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/twitter/AuthorizationUrlGenerator.java (original)
+++ openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/twitter/AuthorizationUrlGenerator.java Sun Jun 19 14:25:11 2011
@@ -16,6 +16,7 @@
*/
package org.apache.openejb.tools.twitter;
+import java.util.Properties;
import oauth.signpost.OAuth;
import oauth.signpost.OAuthConsumer;
import oauth.signpost.OAuthProvider;
@@ -27,8 +28,6 @@ import oauth.signpost.exception.OAuthMes
import oauth.signpost.exception.OAuthNotAuthorizedException;
import org.apache.openejb.tools.twitter.util.RetweetAppUtil;
-import java.util.Properties;
-
public class AuthorizationUrlGenerator {
static Properties retweetToolProperties;
static OAuthConsumer consumer;
Modified: openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/twitter/JsonResponseParser.java
URL: http://svn.apache.org/viewvc/openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/twitter/JsonResponseParser.java?rev=1137371&r1=1137370&r2=1137371&view=diff
==============================================================================
--- openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/twitter/JsonResponseParser.java (original)
+++ openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/twitter/JsonResponseParser.java Sun Jun 19 14:25:11 2011
@@ -16,6 +16,11 @@
*/
package org.apache.openejb.tools.twitter;
+import java.io.IOException;
+import java.io.Reader;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
import org.apache.http.HttpResponse;
import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.ResponseHandler;
@@ -26,12 +31,6 @@ import org.codehaus.jackson.map.JsonMapp
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.type.TypeReference;
-import java.io.IOException;
-import java.io.Reader;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
public class JsonResponseParser {
Modified: openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/twitter/OpenEJBMessageFilterUtil.java
URL: http://svn.apache.org/viewvc/openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/twitter/OpenEJBMessageFilterUtil.java?rev=1137371&r1=1137370&r2=1137371&view=diff
==============================================================================
--- openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/twitter/OpenEJBMessageFilterUtil.java (original)
+++ openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/twitter/OpenEJBMessageFilterUtil.java Sun Jun 19 14:25:11 2011
@@ -24,7 +24,6 @@ import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.Map;
-
import org.apache.log4j.Logger;
public class OpenEJBMessageFilterUtil implements RetweetAppConstants {
Modified: openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/twitter/Retweet.java
URL: http://svn.apache.org/viewvc/openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/twitter/Retweet.java?rev=1137371&r1=1137370&r2=1137371&view=diff
==============================================================================
--- openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/twitter/Retweet.java (original)
+++ openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/twitter/Retweet.java Sun Jun 19 14:25:11 2011
@@ -20,13 +20,11 @@ import java.io.IOException;
import java.util.Collection;
import java.util.Properties;
import java.util.Set;
-
import oauth.signpost.OAuthConsumer;
import oauth.signpost.commonshttp.CommonsHttpOAuthConsumer;
import oauth.signpost.exception.OAuthCommunicationException;
import oauth.signpost.exception.OAuthExpectationFailedException;
import oauth.signpost.exception.OAuthMessageSignerException;
-
import org.apache.http.HttpResponse;
import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.HttpClient;
Modified: openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/twitter/ScreenNamesRetriever.java
URL: http://svn.apache.org/viewvc/openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/twitter/ScreenNamesRetriever.java?rev=1137371&r1=1137370&r2=1137371&view=diff
==============================================================================
--- openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/twitter/ScreenNamesRetriever.java (original)
+++ openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/twitter/ScreenNamesRetriever.java Sun Jun 19 14:25:11 2011
@@ -22,11 +22,9 @@ import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-
import oauth.signpost.exception.OAuthCommunicationException;
import oauth.signpost.exception.OAuthExpectationFailedException;
import oauth.signpost.exception.OAuthMessageSignerException;
-
import org.apache.http.HttpResponse;
import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.HttpClient;
Modified: openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/twitter/UserStatusRetriever.java
URL: http://svn.apache.org/viewvc/openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/twitter/UserStatusRetriever.java?rev=1137371&r1=1137370&r2=1137371&view=diff
==============================================================================
--- openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/twitter/UserStatusRetriever.java (original)
+++ openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/twitter/UserStatusRetriever.java Sun Jun 19 14:25:11 2011
@@ -22,7 +22,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-
import org.apache.http.HttpResponse;
import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.methods.HttpGet;
Modified: openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/twitter/util/RetweetAppUtil.java
URL: http://svn.apache.org/viewvc/openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/twitter/util/RetweetAppUtil.java?rev=1137371&r1=1137370&r2=1137371&view=diff
==============================================================================
--- openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/twitter/util/RetweetAppUtil.java (original)
+++ openejb/trunk/sandbox/tools/src/main/java/org/apache/openejb/tools/twitter/util/RetweetAppUtil.java Sun Jun 19 14:25:11 2011
@@ -16,12 +16,11 @@
*/
package org.apache.openejb.tools.twitter.util;
-import org.apache.log4j.Logger;
-import org.springframework.core.io.ClassPathResource;
-
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.Properties;
+import org.apache.log4j.Logger;
+import org.springframework.core.io.ClassPathResource;
public class RetweetAppUtil {
Modified: openejb/trunk/sandbox/tools/src/main/resources/generate-index/config.properties
URL: http://svn.apache.org/viewvc/openejb/trunk/sandbox/tools/src/main/resources/generate-index/config.properties?rev=1137371&r1=1137370&r2=1137371&view=diff
==============================================================================
--- openejb/trunk/sandbox/tools/src/main/resources/generate-index/config.properties (original)
+++ openejb/trunk/sandbox/tools/src/main/resources/generate-index/config.properties Sun Jun 19 14:25:11 2011
@@ -1 +1,35 @@
base=http://people.apache.org/~rmannibucau
+
+# input/output
+examples.zip = /tmp/examples.zip
+examples.working = /tmp/openejb
+
+# file properties
+excluded = examples,.svn,target,.git,.settings
+extracted = extracted
+generated = generated
+index = index.html
+glossary = glossary.html
+readme = README.md
+pom = pom.xml
+
+javascripts = javascripts
+css = css
+velocity = generate-index/velocity/
+
+# templates properties
+template.main = index.vm
+template.code = code.vm
+template.default = example.vm
+template.external = external.vm
+template.glossary = glossary.vm
+
+template.var.title = title
+template.var.base = base
+
+# api management
+api.filtering = javax.
+api.import = import
+
+# zip
+zip.buffer = 1024
Modified: openejb/trunk/sandbox/tools/src/test/java/org/apache/openejb/tools/RetweetITest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/sandbox/tools/src/test/java/org/apache/openejb/tools/RetweetITest.java?rev=1137371&r1=1137370&r2=1137371&view=diff
==============================================================================
--- openejb/trunk/sandbox/tools/src/test/java/org/apache/openejb/tools/RetweetITest.java (original)
+++ openejb/trunk/sandbox/tools/src/test/java/org/apache/openejb/tools/RetweetITest.java Sun Jun 19 14:25:11 2011
@@ -16,7 +16,6 @@
*/
package org.apache.openejb.tools;
-import static org.junit.Assert.*;
import java.io.IOException;
import org.apache.http.HttpResponse;
import org.apache.http.client.ClientProtocolException;
@@ -27,6 +26,9 @@ import org.apache.openejb.tools.twitter.
import org.apache.openejb.tools.twitter.UserStatusRetriever;
import org.junit.Test;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
public class RetweetITest {
@Test