geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmcma...@apache.org
Subject svn commit: r551566 [6/7] - in /geronimo/sandbox/j2g: configurator/ plugins/ plugins/org.apache.geronimo.j2g.common/ plugins/org.apache.geronimo.j2g.descriptors.app/ plugins/org.apache.geronimo.j2g.descriptors.app/META-INF/ plugins/org.apache.geronimo....
Date Thu, 28 Jun 2007 14:14:56 GMT
Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources/build.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources/build.properties?view=diff&rev=551566&r1=551565&r2=551566
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources/build.properties (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources/build.properties Thu Jun 28 07:14:50 2007
@@ -19,3 +19,4 @@
 bin.includes = META-INF/,\
                .,\
                plugin.xml
+source.. = src/

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources/plugin.xml?view=diff&rev=551566&r1=551565&r2=551566
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources/plugin.xml (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources/plugin.xml Thu Jun 28 07:14:50 2007
@@ -26,4 +26,28 @@
          <run class="org.apache.geronimo.j2g.resources.ResourcesTool"/>
       </application>
    </extension>
+   <extension
+         point="org.apache.geronimo.j2g.resources.migrations">
+      <migration
+            class="org.apache.geronimo.j2g.resources.datasources.DSResourcesTool">
+      </migration>
+   </extension>
+   <extension
+         point="org.apache.geronimo.j2g.resources.migrations">
+      <migration
+            class="org.apache.geronimo.j2g.resources.jms.JMSResourcesTool">
+      </migration>
+   </extension>
+   <extension
+         point="org.apache.geronimo.j2g.resources.migrations">
+      <migration
+            class="org.apache.geronimo.j2g.resources.mail.MailResourcesTool">
+      </migration>
+   </extension>
+   <extension
+         point="org.apache.geronimo.j2g.resources.migrations">
+      <migration
+            class="org.apache.geronimo.j2g.resources.security.SecurityResourcesTool">
+      </migration>
+   </extension>
 </plugin>

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources/pom.xml?view=diff&rev=551566&r1=551565&r2=551566
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources/pom.xml (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.resources/pom.xml Thu Jun 28 07:14:50 2007
@@ -48,5 +48,10 @@
             <artifactId>org.apache.geronimo.j2g.common</artifactId>
             <version>${version}</version>
         </dependency>
+       	<dependency>
+            <groupId>org.apache.geronimo.tools</groupId>
+            <artifactId>org.apache.geronimo.j2g.util</artifactId>
+           	<version>${version}</version>
+       	</dependency>
     </dependencies>
 </project>

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/.classpath
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/.classpath?view=diff&rev=551566&r1=551565&r2=551566
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/.classpath (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/.classpath Thu Jun 28 07:14:50 2007
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry exported="true" kind="lib" path="lib/geronimo-util-1.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/geronimo-security-1.1.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/.project
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/.project?view=diff&rev=551566&r1=551565&r2=551566
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/.project (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/.project Thu Jun 28 07:14:50 2007
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.apache.geronimo.j2g.sources.dependence</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/META-INF/MANIFEST.MF?view=diff&rev=551566&r1=551565&r2=551566
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/META-INF/MANIFEST.MF (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/META-INF/MANIFEST.MF Thu Jun 28 07:14:50 2007
@@ -1,47 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: J2G Dependecies Plug-in
-Bundle-SymbolicName: org.apache.geronimo.j2g.sources.dependence;singleton:=true
-Bundle-Version: 1.0.0
-Bundle-Vendor: Apache.org
-Bundle-Localization: plugin
-Require-Bundle: org.apache.geronimo.j2g.common,
- org.apache.geronimo.j2g.sources,
- org.eclipse.jdt.core,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.jdt,
- org.eclipse.jface.text
-Bundle-ClassPath: .,
- lib/geronimo-security-1.1.jar,
- lib/geronimo-util-1.1.jar
-Export-Package: org.apache.geronimo.j2g.sources.dependence,
- org.apache.geronimo.j2g.sources.dependence.compatibility,
- org.apache.geronimo.security,
- org.apache.geronimo.security.deploy,
- org.apache.geronimo.security.jaas,
- org.apache.geronimo.security.jaas.client,
- org.apache.geronimo.security.jaas.server,
- org.apache.geronimo.security.jacc,
- org.apache.geronimo.security.keystore,
- org.apache.geronimo.security.network.protocol,
- org.apache.geronimo.security.realm,
- org.apache.geronimo.security.realm.providers,
- org.apache.geronimo.security.remoting.jmx,
- org.apache.geronimo.security.util,
- org.apache.geronimo.util,
- org.apache.geronimo.util.asn1,
- org.apache.geronimo.util.asn1.cryptopro,
- org.apache.geronimo.util.asn1.misc,
- org.apache.geronimo.util.asn1.oiw,
- org.apache.geronimo.util.asn1.pkcs,
- org.apache.geronimo.util.asn1.sec,
- org.apache.geronimo.util.asn1.util,
- org.apache.geronimo.util.asn1.x509,
- org.apache.geronimo.util.asn1.x9,
- org.apache.geronimo.util.crypto,
- org.apache.geronimo.util.crypto.params,
- org.apache.geronimo.util.encoders,
- org.apache.geronimo.util.jce,
- org.apache.geronimo.util.jce.interfaces,
- org.apache.geronimo.util.jce.provider

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/build.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/build.properties?view=diff&rev=551566&r1=551565&r2=551566
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/build.properties (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/build.properties Thu Jun 28 07:14:50 2007
@@ -1,24 +0,0 @@
-/**
- *  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.
- */
- source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               lib/geronimo-security-1.1.jar,\
-               lib/geronimo-util-1.1.jar
-

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/plugin.xml?view=diff&rev=551566&r1=551565&r2=551566
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/plugin.xml (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/plugin.xml Thu Jun 28 07:14:50 2007
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<!--
-  ~ 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.
-  -->
-<plugin>
-   <extension
-         point="org.apache.geronimo.j2g.sources.migrations">
-      <migration class="org.apache.geronimo.j2g.sources.dependence.DependenceJavaMigration"/>
-   </extension>
-
-</plugin>

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/pom.xml?view=diff&rev=551566&r1=551565&r2=551566
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/pom.xml (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/pom.xml Thu Jun 28 07:14:50 2007
@@ -97,3 +97,102 @@
        	</dependency>
     </dependencies>
 </project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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.
+  -->
+<!-- $Rev$ $Date$ -->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.geronimo.tools</groupId>
+    <artifactId>org.apache.geronimo.j2g.sources.dependence</artifactId>
+    <packaging>jar</packaging>
+    <name>${artifactId}</name>
+    <parent>
+        <groupId>org.apache.geronimo.tools</groupId>
+        <artifactId>j2g-plugins</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <build>
+        <resources>
+            <resource>
+                <directory>.</directory>
+                <includes>
+                    <include>plugin.xml</include>
+                </includes>
+            </resource>
+            <resource>
+                <directory>lib</directory>
+                <targetPath>lib</targetPath>
+                <includes>
+                    <include>*.jar</include>
+                </includes>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                	<groupId>geronimo</groupId>
+            						<artifactId>geronimo-security</artifactId>
+                                </artifactItem>
+                                <artifactItem>
+                                	<groupId>geronimo</groupId>
+            						<artifactId>geronimo-util</artifactId>
+                                </artifactItem>
+                            </artifactItems>
+                            <outputDirectory>lib</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.geronimo.devtools</groupId>
+                <artifactId>maven-eclipsepde-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+		<dependency>
+        	<groupId>geronimo</groupId>
+            <artifactId>geronimo-security</artifactId>
+        </dependency>
+		<dependency>
+        	<groupId>geronimo</groupId>
+            <artifactId>geronimo-util</artifactId>
+        </dependency>
+		<dependency>
+            <groupId>org.apache.geronimo.tools</groupId>
+            <artifactId>org.apache.geronimo.j2g.common</artifactId>
+            <version>${version}</version>
+       	</dependency>
+       	<dependency>
+            <groupId>org.apache.geronimo.tools</groupId>
+            <artifactId>org.apache.geronimo.j2g.sources</artifactId>
+           	<version>${version}</version>
+       	</dependency>
+    </dependencies>
+</project>

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/src/org/apache/geronimo/j2g/sources/dependence/APIReplaceVisitor.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/src/org/apache/geronimo/j2g/sources/dependence/APIReplaceVisitor.java?view=diff&rev=551566&r1=551565&r2=551566
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/src/org/apache/geronimo/j2g/sources/dependence/APIReplaceVisitor.java (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/src/org/apache/geronimo/j2g/sources/dependence/APIReplaceVisitor.java Thu Jun 28 07:14:50 2007
@@ -1,151 +0,0 @@
-/**
- *  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.
- */
-package org.apache.geronimo.j2g.sources.dependence;
-
-import java.util.List;
-
-import org.apache.geronimo.j2g.common.IOutput;
-import org.apache.geronimo.j2g.common.Tool;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTMatcher;
-import org.eclipse.jdt.core.dom.ASTVisitor;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.ImportDeclaration;
-import org.eclipse.jdt.core.dom.Name;
-import org.eclipse.jdt.core.dom.QualifiedName;
-import org.eclipse.jdt.core.dom.SimpleName;
-import org.eclipse.jdt.core.dom.StructuralPropertyDescriptor;
-
-
-/**
- * Finds specified names and replaces its by new one.
- */
-public class APIReplaceVisitor extends ASTVisitor {
-
-	/** Name to replace */
-	private QualifiedName targetName;
-
-	/** New name */
-	private QualifiedName newName;
-
-	/** Compilation unit */
-	private CompilationUnit unit;
-
-	/** Nodes matcher */
-	private ASTMatcher matcher;
-
-	/** Output */
-	private IOutput out;
-
-	/** Import changing flag */
-	private boolean isImportAffected;
-
-	/** Changes counter */
-	private int changes = 0; 
-	
-	/**
-	 * Constructor. Creates new instance of APIReplaceVisitor.
-	 * @param unit compilation unit.
-	 * @param targetName target name.
-	 * @param newName new name.
-	 */
-	public APIReplaceVisitor(CompilationUnit unit, QualifiedName targetName, QualifiedName newName) {
-		super(false);
-		this.targetName = targetName;
-		this.newName = newName;
-		this.unit = unit;
-		matcher = new ASTMatcher(false);
-		out = Tool.getCurrent().getOutput();
-		isImportAffected = false;
-	}
-
-	/**
-	 * Replaces qualified names in imports.
-	 */
-	public boolean visit(ImportDeclaration importDeclaration) {
-		QualifiedName name = (QualifiedName) importDeclaration.getName();
-		if (!importDeclaration.isOnDemand()) {
-			int position = name.getStartPosition();
-			if (matcher.match(name, targetName)) {
-				isImportAffected = true;
-				AST ast = importDeclaration.getAST();
-				Name replacer = ast.newName(newName.getFullyQualifiedName());
-				printChanges(name, newName, unit.getLineNumber(position), unit.getColumnNumber(position));
-				importDeclaration.setName(replacer);
-			}
-		}
-		else {
-			if (matcher.match(name, targetName.getQualifier())) {
-				List imports = unit.imports();
-				AST ast = unit.getAST();
-				ImportDeclaration newImport = ast.newImportDeclaration();
-				newImport.setName(newName);
-				imports.add(newImport);
-				isImportAffected = true;
-				out.info("New import was added: '" + newName.getFullyQualifiedName()+"'.");
-				changes++;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Replaces qualified name.
-	 */
-	public boolean visit(QualifiedName name) {
-		int position = name.getStartPosition();
-		if (matcher.match(name, targetName)) {
-			AST ast = name.getAST();
-			Name replacer = ast.newName(newName.getFullyQualifiedName());
-			StructuralPropertyDescriptor desc = name.getLocationInParent();
-			printChanges(name, newName, unit.getLineNumber(position), unit.getColumnNumber(position));
-			name.getParent().setStructuralProperty(desc, replacer);
-		}
-		return false;
-	}
-
-	/**
-	 * Replaces simple name.
-	 */
-	public boolean visit(SimpleName name) {
-		int position = name.getStartPosition();
-		if (matcher.match(name, targetName.getName()) && isImportAffected) {
-			printChanges(name, newName.getName(), unit.getLineNumber(position), unit.getColumnNumber(position));
-			name.setIdentifier(newName.getName().getIdentifier());
-		}
-		return false;
-	}
-
-	/**
-	 * Prints out about changes in compilation unit.
-	 * @param name replaced name.
-	 * @param newName new name.
-	 * @param row row in source unit.
-	 * @param col column in source unit.
-	 */
-	private void printChanges(Name name, Name newName, int row, int col) {
-		changes++;
-		out.info("Name '" + name.getFullyQualifiedName() + "' was replaced by '" + newName.getFullyQualifiedName() + "'.", row, col);
-	}
-
-	/**
-	 * @return the changes count
-	 */
-	public int getChanges() {
-		return changes;
-	}
-}

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/src/org/apache/geronimo/j2g/sources/dependence/DependenceJavaMigration.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/src/org/apache/geronimo/j2g/sources/dependence/DependenceJavaMigration.java?view=diff&rev=551566&r1=551565&r2=551566
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/src/org/apache/geronimo/j2g/sources/dependence/DependenceJavaMigration.java (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/src/org/apache/geronimo/j2g/sources/dependence/DependenceJavaMigration.java Thu Jun 28 07:14:50 2007
@@ -1,268 +0,0 @@
-/**
- *  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.
- */
-
-package org.apache.geronimo.j2g.sources.dependence;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.util.Iterator;
-import java.util.Properties;
-import java.util.Set;
-
-import org.apache.geronimo.j2g.common.FatalToolException;
-import org.apache.geronimo.j2g.common.IJavaMigration;
-import org.apache.geronimo.j2g.common.IOutput;
-import org.apache.geronimo.j2g.common.RollbackManager;
-import org.apache.geronimo.j2g.common.Tool;
-import org.apache.geronimo.j2g.common.ToolConstants;
-import org.apache.geronimo.j2g.sources.dependence.compatibility.Anybody;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.dom.AST;
-import org.eclipse.jdt.core.dom.ASTNode;
-import org.eclipse.jdt.core.dom.ASTParser;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.Name;
-import org.eclipse.jdt.core.dom.QualifiedName;
-import org.eclipse.jface.text.Document;
-import org.eclipse.text.edits.TextEdit;
-
-/**
- * Determines all references of the source compilation unit to classes which are incompatible with
- * Geronimo.
- */
-public class DependenceJavaMigration implements IJavaMigration {
-	/**
-	 * Plug-in name.
-	 */
-	private final static String PLUGIN_NAME = "Dependence plug-in";
-
-	/**
-	 * Tool output
-	 */
-	private IOutput out;
-	
-	/**
-	 * Property file with default Geronimo libraries names.
-	 */
-	private final String DEFAULT_LIBS_FILENAME = "../properties/org.apache.geronimo.j2g.sources.dependence/default_jars.properties";
-
-	/**
-	 * Set of default Geronimo libraries names.
-	 */
-	private static Set defaultLibs;
-
-	/**
-	 * Compatibility sources names.
-	 */
-	private final String COMPATIBILITY_SOURCES = "../properties/org.apache.geronimo.j2g.sources.dependence/compatible_sources.properties";
-
-	/**
-	 * Set of default Geronimo libraries names.
-	 */
-	private static Properties compatibilitySources;
-
-	/**
-	 * Property file with class analogies.
-	 */
-	private final String CLASS_ANALOGIES_FILENAME = "../properties/org.apache.geronimo.j2g.sources.dependence/class_analogies.properties";
-
-	/**
-	 * Properties with class analogies.
-	 */
-	private static Properties classAnalogies;
-
-	/**
-	 * Compatibles package qualified name.
-	 */
-	private static final String COMPATIBLES_PACKAGE = "org/apache/geronimo/j2g/sources/dependence/compatibility";
-
-	/**
-	 * Location of Compatibles Files.
-	 */
-	private static final String COMPATIBLES_LOCATION = "../compatibility/org.apache.geronimo.j2g.sources.dependence.compatibility";
-	/**
-	 * Java resources extension.
-	 */
-	private static final String JAVA_EXT = ".java";
-
-	/**
-	 * Byte buffer size.
-	 */
-	private static final int BUFFER_SIZE = 1024;
-
-	/**
-	 * Constructor. Loads default libs names and class analogies names.
-	 * @throws FatalToolException if cannot load properties file with default jars names.
-	 */
-	public DependenceJavaMigration() throws FatalToolException {
-		super();
-		if (defaultLibs == null) {
-			try {
-				File propertyFile = new File(DEFAULT_LIBS_FILENAME);
-				Properties prop = new Properties();
-				prop.load(new FileInputStream(propertyFile));
-				defaultLibs = prop.keySet();
-			} catch (IOException e) {
-				throw new FatalToolException("Cannot load properties file with default jars names.");
-			}
-		}
-
-		if (classAnalogies == null) {
-			try {
-				File propertyFile = new File(CLASS_ANALOGIES_FILENAME);
-				classAnalogies = new Properties();
-				classAnalogies.load(new FileInputStream(propertyFile));
-			} catch (IOException e) {
-				throw new FatalToolException("Cannot load properties file with class analogies.");
-			}
-		}
-		if (compatibilitySources == null) {
-			try {
-				File propertyFile = new File(COMPATIBILITY_SOURCES);
-				compatibilitySources = new Properties();
-				compatibilitySources.load(new FileInputStream(COMPATIBILITY_SOURCES));
-			} catch (IOException e) {
-				throw new FatalToolException("Cannot load properties file with compatibility classnames.");
-			}
-
-		}
-	}
-
-	/**
-	 * Determines all references of the source compilation unit to classes which are incompatible
-	 * with Geronimo.
-	 * @param source compilation unit for migration.
-	 */
-	public boolean migrate(ASTNode source) {
-		out = Tool.getCurrent().getOutput();
-		if (source instanceof CompilationUnit) {
-			CompilationUnit compilationUnit = (CompilationUnit) source;
-			String unitName = compilationUnit.getJavaElement().getElementName();
-			boolean isSourceChanged = false;
-			out.info("[" + PLUGIN_NAME + "] " + "Migration started: " + unitName);
-			Set replacedClasses = classAnalogies.keySet();
-			AST ast = compilationUnit.getAST();
-			Iterator classesIterator = replacedClasses.iterator();
-			while (classesIterator.hasNext()) {
-				String targetStr = (String) classesIterator.next();
-				String newStr = classAnalogies.getProperty(targetStr);
-				Name replaced = ast.newName(targetStr);
-				Name replacer = ast.newName(newStr);
-
-				if (replaced.isQualifiedName() && replacer.isQualifiedName()) {
-					QualifiedName targetName = (QualifiedName) replaced;
-					QualifiedName newName = (QualifiedName) replacer;
-					APIReplaceVisitor apiReplacer = new APIReplaceVisitor(compilationUnit, targetName, newName);
-					compilationUnit.accept(apiReplacer);
-					apiReplacer.visit(compilationUnit);
-					isSourceChanged = isSourceChanged || (apiReplacer.getChanges() > 0);
-				}
-				else {
-					out.error("Wrong class names for JBoss classes and it's Geronimo analogies in property file");
-					break;
-				}
-
-			}
-			try {
-				if (isSourceChanged) {
-					String path = compilationUnit.getJavaElement().getUnderlyingResource().getLocation().toPortableString();
-					String package_path = compilationUnit.getPackage().getName().getFullyQualifiedName().replace('.', IPath.SEPARATOR);
-					String src_path = path.substring(0, path.indexOf(package_path));
-					String compatible_dir = src_path + COMPATIBLES_PACKAGE;
-					File pack = new File(compatible_dir);
-					File sourceDir = new File(COMPATIBLES_LOCATION);
-					if (!pack.exists()) {
-						pack.mkdirs();
-						Set compatibleSources = compatibilitySources.keySet();
-						Iterator keys = compatibleSources.iterator();
-						while (keys.hasNext()) {
-							String classname = (String)keys.next();
-							String sourceName = classname.substring(classname.lastIndexOf('.') + 1) + JAVA_EXT;
-							File addedSource = new File(pack, sourceName);
-							addedSource.createNewFile();
-							PrintWriter writer = new PrintWriter(new FileOutputStream(addedSource));
-							InputStream inStream = new FileInputStream(new File(sourceDir,sourceName));
-
-							byte[] buffer = new byte[BUFFER_SIZE];
-							int len = 0;
-							while ((len = inStream.read(buffer)) > 0) {
-								String outpt = new String(buffer, 0, len);
-								writer.print(outpt);
-							}
-							inStream.close();
-							writer.close();
-						}
-						IWorkspace workspace = ResourcesPlugin.getWorkspace();
-						IProject project = workspace.getRoot().getProject(ToolConstants.TEMPORARY_PROJECT_NAME);
-						project.refreshLocal(IResource.DEPTH_INFINITE, null);
-					}
-					ICompilationUnit isource = (ICompilationUnit) compilationUnit.getJavaElement();
-					String contents = isource.getBuffer().getContents();
-					File file = new File(isource.getUnderlyingResource().getLocation().toOSString() + RollbackManager.BACKUP_SUFFIX);
-					file.createNewFile();
-					FileOutputStream fout = new FileOutputStream(file);
-					fout.write(contents.getBytes());
-					fout.close();
-					Document document = new Document(contents);
-					TextEdit edits = compilationUnit.rewrite(document, isource.getJavaProject().getOptions(true));
-					edits.apply(document);
-					String newSource = document.get();
-					isource.getBuffer().setContents(newSource);
-					isource.save(null, true);
-
-					ASTParser parser = ASTParser.newParser(AST.JLS3);
-					parser.setResolveBindings(true);
-					parser.setSource(isource);
-					compilationUnit = (CompilationUnit) parser.createAST(null);
-				}
-			} catch (IOException ex) {
-				out.fatal("The plug-in cannot add compatible package or save buckup because of I/O error occurs. Make sure that the source directories are not under write protection.");
-			} catch (Exception e) {
-				out.fatal("The plug-in cannot get access to the resources. Make sure that the source files are not under write protection or not deleted by another process.");
-			}
-			NodesVisitor visitor = new NodesVisitor(compilationUnit);
-			compilationUnit.accept(visitor);
-			visitor.visit(compilationUnit);
-			boolean isSourceValid = visitor.isSourceValid();
-			if (isSourceChanged && !isSourceValid) {
-				out.warn("Errors were found in source file! Changes were saved. The original file was saved with name " + unitName + RollbackManager.BACKUP_SUFFIX);
-			}
-			out.info("[" + PLUGIN_NAME + "] " + "Migration finished: " + unitName);
-			return false;
-		}
-		else {
-			out.error("[" + PLUGIN_NAME + "] " + "Wrong type of source node.");
-		}
-		return false;
-	}
-
-	/**
-	 * @return set of default lib names.
-	 */
-	public static Set getDefaultLibs() {
-		return defaultLibs;
-	}
-}

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/src/org/apache/geronimo/j2g/sources/dependence/NodesVisitor.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/src/org/apache/geronimo/j2g/sources/dependence/NodesVisitor.java?view=diff&rev=551566&r1=551565&r2=551566
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/src/org/apache/geronimo/j2g/sources/dependence/NodesVisitor.java (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/src/org/apache/geronimo/j2g/sources/dependence/NodesVisitor.java Thu Jun 28 07:14:50 2007
@@ -1,369 +0,0 @@
-/**
- *  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.
- */
-
-package org.apache.geronimo.j2g.sources.dependence;
-
-import java.io.File;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.geronimo.j2g.common.FatalToolException;
-import org.apache.geronimo.j2g.common.IOutput;
-import org.apache.geronimo.j2g.common.Tool;
-import org.apache.geronimo.j2g.common.ToolConstants;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.dom.ASTVisitor;
-import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.Expression;
-import org.eclipse.jdt.core.dom.IBinding;
-import org.eclipse.jdt.core.dom.ITypeBinding;
-import org.eclipse.jdt.core.dom.ImportDeclaration;
-import org.eclipse.jdt.core.dom.MethodDeclaration;
-import org.eclipse.jdt.core.dom.MethodInvocation;
-import org.eclipse.jdt.core.dom.Name;
-import org.eclipse.jdt.core.dom.QualifiedName;
-import org.eclipse.jdt.core.dom.QualifiedType;
-import org.eclipse.jdt.core.dom.SimpleName;
-import org.eclipse.jdt.core.dom.SimpleType;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
-import org.eclipse.jdt.core.dom.Type;
-import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
-
-
-/**
- * Visitor for ASTNode. Finds types dependencies and reports to tool output.
- */
-public class NodesVisitor extends ASTVisitor {
-	/**
-	 * Tool output.
-	 */
-	private IOutput out;
-
-	/**
-	 * Current compilation unit.
-	 */
-	private CompilationUnit unit;
-
-	/**
-	 * Set of declared variables.
-	 */
-	private Set vars;
-
-	/**
-	 * Set of already picked libraries.
-	 */
-	private Set linkedLibs;
-
-	/**
-	 * Set of declared classes in imports.
-	 */
-	private Set imports;
-
-	/**
-	 * 
-	 */
-	
-	private boolean wrongApiUsing;
-
-	/**
-	 * Constructor.
-	 * 
-	 * @param unit
-	 *            compilation unit which will be visited.
-	 * @param out
-	 * @param visitDocTypes
-	 */
-	public NodesVisitor(CompilationUnit unit) {
-		super(false);
-		this.out = Tool.getCurrent().getOutput();
-		this.unit = unit;
-		vars = new HashSet();
-		linkedLibs = new HashSet();
-		imports = new HashSet();
-		wrongApiUsing = false;
-		
-		List compUnitList = unit.imports();
-		Iterator listIter = compUnitList.iterator();
-		while (listIter.hasNext()) {
-			ImportDeclaration impDec = (ImportDeclaration)listIter.next();
-			if (impDec.getName().isQualifiedName()) {
-				QualifiedName qualifiedName = (QualifiedName) impDec.getName();
-				String className = qualifiedName.getName().getIdentifier();
-				imports.add(className);
-			}
-			else {
-				SimpleName simpleName = (SimpleName) impDec.getName();
-				imports.add(simpleName.getIdentifier());
-			}
-		}
-	}
-
-	/**
-	 * Solves binding and if it's corressponds to Geronimo repository library
-	 * warns about it.
-	 * 
-	 * @param binding
-	 * @throws FatalToolException
-	 */
-	private void solveBinding(IBinding binding, String name) {
-		if (binding instanceof ITypeBinding) {
-			try {
-				String linkedJarName = binding.getJavaElement().getPath().toFile().getName();
-				if (linkedJarName.startsWith(ToolConstants.GERONIMO_REP)) {
-					File lib = binding.getJavaElement().getUnderlyingResource().getRawLocation().toFile();
-					String artifactName = getGeronimoArtifactName(lib);
-					if (!linkedLibs.contains(lib.getName()) && !DependenceJavaMigration.getDefaultLibs().contains(artifactName)) {
-						out.warn("You should add '" + artifactName + "' dependency.");
-						linkedLibs.add(lib.getName());
-					}
-				}
-			} catch (JavaModelException e) {
-				out.fatal("Cannot get access to library for resolve name'" + name + "'.");
-			}
-		}
-	}
-
-	/**
-	 * Visits {@link ImportDeclaration} and trying to resolve binding.
-	 */
-	public boolean visit(ImportDeclaration importDeclaration) {
-		if (importDeclaration.resolveBinding() != null) {
-			String name = importDeclaration.getName().getFullyQualifiedName();
-			solveBinding(importDeclaration.resolveBinding(), name);
-		}
-		else {
-			printImportError(importDeclaration.getName().getFullyQualifiedName(), importDeclaration.getStartPosition());
-			if (importDeclaration.getName().isQualifiedName()) {
-				QualifiedName qualifiedName = (QualifiedName) importDeclaration.getName();
-				String className = qualifiedName.getName().getIdentifier();
-				imports.add(className);
-			}
-			else {
-				SimpleName simpleName = (SimpleName) importDeclaration.getName();
-				imports.add(simpleName.getIdentifier());
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Visits {@link QualifiedType} and trying to resolve binding.
-	 */
-	public boolean visit(QualifiedType qualifiedType) {
-		if (qualifiedType.resolveBinding() != null) {
-			String name = qualifiedType.getName().getFullyQualifiedName();
-			solveBinding(qualifiedType.resolveBinding(), name);
-			return true;
-		}
-		else {
-			Type qualifier = qualifiedType.getQualifier();
-			if (qualifier instanceof QualifiedType) {
-				if (visit((QualifiedType) qualifier)) {
-					printTypeError(qualifiedType.getName().getFullyQualifiedName(), qualifiedType.getStartPosition());
-				}
-			}
-			else {
-				if (visit((SimpleType) qualifier)) {
-					printTypeError(qualifiedType.getName().getFullyQualifiedName(), qualifiedType.getStartPosition());
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Visits {@link SimpleType} and trying to resolve binding.
-	 */
-	public boolean visit(SimpleType simpleType) {
-		if (simpleType.resolveBinding() != null) {
-			String name = simpleType.getName().getFullyQualifiedName(); 
-			solveBinding(simpleType.resolveBinding(), name );
-		}
-		else {
-			printTypeError(simpleType.getName().getFullyQualifiedName(), simpleType.getStartPosition());
-		}
-		return false;
-	}
-
-	/**
-	 * Visits {@link QualifiedName} and trying to resolve binding.
-	 */
-	public boolean visit(QualifiedName qualifiedName) {
-		if (qualifiedName.resolveBinding() != null) {
-			String name = qualifiedName.getFullyQualifiedName();
-			solveBinding(qualifiedName.resolveBinding(), name);
-			return true;
-		}
-		else {
-			Name qualifiedPart = qualifiedName.getQualifier();
-			if (qualifiedPart instanceof QualifiedName) {
-				if (visit((QualifiedName) qualifiedPart)) {
-					printTypeError(qualifiedName.getFullyQualifiedName(), qualifiedName.getStartPosition());
-				}
-				return false;
-			}
-			else {
-				if (qualifiedPart.resolveBinding() != null) {
-					printTypeError(qualifiedName.getFullyQualifiedName(), qualifiedName.getStartPosition());
-				}
-				else {
-					if (!isDeclaredVar(qualifiedPart.toString())) {
-						printTypeError(qualifiedPart.getFullyQualifiedName(), qualifiedPart.getStartPosition());
-					}
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Visits {@link MethodDeclaration} and trying to resolve binding.
-	 */
-	public boolean visit(MethodDeclaration method) {
-		List names = method.thrownExceptions();
-		if (names != null) {
-			Iterator iter = names.iterator();
-			while (iter.hasNext()) {
-				Name name = (Name) iter.next();
-				if (name.resolveBinding() != null) {
-					String nameStr = name.getFullyQualifiedName();
-					solveBinding(name.resolveBinding(), nameStr);
-				}
-				else {
-					printTypeError(name.getFullyQualifiedName(), name.getStartPosition());
-				}
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * Visits {@link MethodInvocation} and trying to resolve binding.
-	 */
-	public boolean visit(MethodInvocation methodInvocation) {
-		Expression expr = methodInvocation.getExpression();
-		if (expr == null) {
-			if (methodInvocation.resolveMethodBinding() == null) {
-				printTypeError(methodInvocation.getName().getFullyQualifiedName(), methodInvocation.getStartPosition());
-			}
-		}
-		else {
-			if (expr.resolveTypeBinding() != null) {
-				String name = expr.toString();
-				solveBinding(expr.resolveTypeBinding(), name);
-			}
-			else {
-				if (expr instanceof MethodInvocation) {
-					visit((MethodInvocation) expr);
-				}
-				else if (expr instanceof QualifiedName) {
-					visit((QualifiedName) expr);
-				}
-				else if (expr instanceof SimpleName) {
-					if (!isDeclaredVar(expr.toString())) {
-						SimpleName simpleName = (SimpleName) expr;
-						printTypeError(simpleName.getFullyQualifiedName(), expr.getStartPosition());
-					}
-				}
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * Visits {@link SingleVariableDeclaration} and adds variable name to the
-	 * list.
-	 */
-	public boolean visit(SingleVariableDeclaration declaration) {
-		vars.add(declaration.getName().toString());
-		return true;
-	}
-
-	/**
-	 * Visits {@link VariableDeclarationFragment} and adds variable name to the
-	 * list.
-	 */
-	public boolean visit(VariableDeclarationFragment declaration) {
-		vars.add(declaration.getName().toString());
-		return true;
-	}
-
-	/**
-	 * @param name
-	 *            simple name.
-	 * @return <code>true</code> if it is declared variable and
-	 *         <code>false</code> if not.
-	 */
-	private boolean isDeclaredVar(String name) {
-		return vars.contains(name);
-	}
-
-	/**
-	 * Prints error about not resolved name.
-	 * 
-	 * @param name
-	 *            not resolved name.
-	 * @param position
-	 *            start position in source file.
-	 */
-	private void printTypeError(String name, int position) {
-		if (!imports.contains(name)) {
-			out.error("The name '" + name + "' cannot be resolved.", unit.getLineNumber(position), unit.getColumnNumber(position));
-			wrongApiUsing = true;
-		}
-	}
-
-	/**
-	 * Prints error about not resolved import.
-	 * 
-	 * @param name
-	 *            import name.
-	 * @param position
-	 *            start position in source file.
-	 */
-	private void printImportError(String name, int position) {
-		wrongApiUsing = true;
-		out.error("The import '" + name + "' cannot be resolved.", unit.getLineNumber(position), unit.getColumnNumber(position));
-	}
-	
-	/**
-	 * Constructs Geronimo artifact name from repository library file.
-	 * 
-	 * @param libFullName
-	 *            full path to the repository library.
-	 * @return Geronimo artifact name.
-	 */
-	private String getGeronimoArtifactName(File libFullName) {
-		String fullName = libFullName.getAbsolutePath();
-		String geronimoRep = ToolConstants.GERONIMO_REPOSITORY_FOLDER + File.separator;
-		String name = fullName.substring(fullName.lastIndexOf(geronimoRep) + geronimoRep.length());
-		name = name.substring(0, name.indexOf(libFullName.getName()));
-		name = name.replace(File.separatorChar, ToolConstants.GERONIMO_SEPARATOR_CHAR);
-		String extension = fullName.substring(fullName.lastIndexOf('.') + 1);
-		return name + extension;
-	}
-	
-	/**
-	 * @return true if source uses proprietary api.
-	 */
-	public boolean isSourceValid(){
-		return !wrongApiUsing;
-	}
-	
-}

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/src/org/apache/geronimo/j2g/sources/dependence/compatibility/Anybody.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/src/org/apache/geronimo/j2g/sources/dependence/compatibility/Anybody.java?view=diff&rev=551566&r1=551565&r2=551566
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/src/org/apache/geronimo/j2g/sources/dependence/compatibility/Anybody.java (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/src/org/apache/geronimo/j2g/sources/dependence/compatibility/Anybody.java Thu Jun 28 07:14:50 2007
@@ -1,60 +0,0 @@
-/**
- *  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.
- */
-/*
- * Auto-generated by J2G Migration. 
- */
-package org.apache.geronimo.j2g.sources.dependence.compatibility;
-
-import java.security.Principal;
-
-public class Anybody
-    implements Comparable, Principal
-{
-
-    public Anybody()
-    {
-    }
-
-    public int hashCode()
-    {
-        return ANYBODY.hashCode();
-    }
-
-    public String getName()
-    {
-        return ANYBODY;
-    }
-
-    public String toString()
-    {
-        return ANYBODY;
-    }
-
-    public boolean equals(Object another)
-    {
-        return true;
-    }
-
-    public int compareTo(Object o)
-    {
-        return 0;
-    }
-
-    public static final String ANYBODY = "<ANYBODY>";
-    public static final Anybody ANYBODY_PRINCIPAL = new Anybody();
-
-}
\ No newline at end of file

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/src/org/apache/geronimo/j2g/sources/dependence/compatibility/DigestCallback.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/src/org/apache/geronimo/j2g/sources/dependence/compatibility/DigestCallback.java?view=diff&rev=551566&r1=551565&r2=551566
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/src/org/apache/geronimo/j2g/sources/dependence/compatibility/DigestCallback.java (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/src/org/apache/geronimo/j2g/sources/dependence/compatibility/DigestCallback.java Thu Jun 28 07:14:50 2007
@@ -1,32 +0,0 @@
-/**
- *  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.
- */
-/*
- * Auto-generated by J2G Migration. 
- */
-package org.apache.geronimo.j2g.sources.dependence.compatibility;
-
-import java.security.MessageDigest;
-import java.util.Map;
-
-public interface DigestCallback {
-
-  public abstract void init(Map map);
-
-  public abstract void preDigest(MessageDigest digest);
-
-  public abstract void postDigest(MessageDigest digest);
-}

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/src/org/apache/geronimo/j2g/sources/dependence/compatibility/GeronimoLoginModule.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/src/org/apache/geronimo/j2g/sources/dependence/compatibility/GeronimoLoginModule.java?view=diff&rev=551566&r1=551565&r2=551566
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/src/org/apache/geronimo/j2g/sources/dependence/compatibility/GeronimoLoginModule.java (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/src/org/apache/geronimo/j2g/sources/dependence/compatibility/GeronimoLoginModule.java Thu Jun 28 07:14:50 2007
@@ -1,352 +0,0 @@
-/**
- *  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.
- */
-/*
- * Auto-generated by J2G Migration. 
- */
-package org.apache.geronimo.j2g.sources.dependence.compatibility;
-
-import java.io.IOException;
-import java.lang.reflect.Constructor;
-import java.security.Principal;
-import java.security.acl.Group;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-import javax.security.auth.Subject;
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.NameCallback;
-import javax.security.auth.callback.PasswordCallback;
-import javax.security.auth.callback.UnsupportedCallbackException;
-import javax.security.auth.login.FailedLoginException;
-import javax.security.auth.login.LoginException;
-import javax.security.auth.spi.LoginModule;
-
-import org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal;
-import org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal;
-
-public abstract class GeronimoLoginModule implements LoginModule {
-
-	protected Subject subject;
-
-	protected CallbackHandler callbackHandler;
-
-	protected Map sharedState;
-
-	protected Map options;
-
-	protected boolean useFirstPass;
-
-	protected boolean loginOk;
-
-	protected String principalClassName;
-
-	protected Principal unauthenticatedIdentity;
-
-	private Principal identity;
-
-	private char passport[];
-
-	private String algorithm;
-
-	private String charset;
-
-	private String encoding;
-
-	private boolean ignorePasswordCase;
-
-	protected final static int USERNAME_POS = 0;
-
-	protected final static int PASSWORD_POS = 1;
-
-	public GeronimoLoginModule() {
-		algorithm = null;
-		charset = null;
-		encoding = null;
-	}
-
-	public boolean abort() throws LoginException {
-		return true;
-	}
-
-	public boolean commit() throws LoginException {
-		if (!loginOk) {
-			return false;
-		}
-		Set heads = subject.getPrincipals();
-		Principal identity = getIdentity();
-		heads.add(identity);
-		Group roleSets[] = getRoleSets();
-		for (int i = 0; i < roleSets.length; i++) {
-			Group group = roleSets[i];
-			String name = group.getName();
-			Group subjectGroup = createGroup(name, heads);
-			Principal role;
-			Enumeration members = group.members();
-			while (members.hasMoreElements()) {
-				role = (Principal) members.nextElement();
-				subjectGroup.addMember(role);
-				if(name.equals("Roles")){
-					heads.add(new GeronimoGroupPrincipal(role.getName()));
-				}
-			}
-		}
-		return true;
-	}
-
-	protected Principal getIdentity() {
-		return identity;
-	}
-
-	public void initialize(Subject subject, CallbackHandler callbackHandler,
-			Map sharedState, Map options) {
-		this.subject = subject;
-		this.callbackHandler = callbackHandler;
-		this.sharedState = sharedState;
-		this.options = options;
-		String passwordStacking = (String) options.get("password-stacking");
-		if (passwordStacking != null
-				&& passwordStacking.equalsIgnoreCase("useFirstPass")) {
-			useFirstPass = true;
-		}
-		principalClassName = (String) options.get("principalClass");
-		String name = (String) options.get("unauthenticatedIdentity");
-		if (name != null) {
-			try {
-				unauthenticatedIdentity = createIdentity(name);
-			} catch (Exception e) {
-			}
-		}
-		algorithm = (String) options.get("hashAlgorithm");
-		if (algorithm != null) {
-			encoding = (String) options.get("hashEncoding");
-			if (encoding == null) {
-				encoding = "BASE64";
-			}
-			charset = (String) options.get("hashCharset");
-		}
-		String flag = (String) options.get("ignorePasswordCase");
-		ignorePasswordCase = Boolean.valueOf(flag).booleanValue();
-	}
-
-	public boolean login() throws LoginException {
-		loginOk = false;
-		if (useFirstPass) {
-			Object identity = sharedState.get("javax.security.auth.login.name");
-			Object credential = sharedState
-					.get("javax.security.auth.login.password");
-			if (identity != null && credential != null) {
-				loginOk = true;
-			}
-		}
-		if (loginOk) {
-			Object username = sharedState.get("javax.security.auth.login.name");
-			if (username instanceof Principal) {
-				identity = (Principal) username;
-			} else {
-				try {
-					identity = createIdentity(username.toString());
-				} catch (Exception e) {
-					throw new LoginException("Failed to create principal: "
-							+ e.getMessage());
-				}
-			}
-			Object password = sharedState
-					.get("javax.security.auth.login.password");
-
-			if (password != null) {
-				if (password instanceof char[]) {
-					passport = (char[]) password;
-				} else {
-					passport = password.toString().toCharArray();
-				}
-			}
-			return true;
-		}
-		loginOk = false;
-
-		String username = null;
-		String password = null;
-
-		String[] usernameAndPassword = getUsernameAndPassword();
-
-		username = usernameAndPassword[USERNAME_POS];
-		password = usernameAndPassword[PASSWORD_POS];
-		if (username == null && password == null) {
-			identity = unauthenticatedIdentity;
-		}
-		if (identity == null) {
-			try {
-				identity = createIdentity(username);
-			} catch (Exception e) {
-				throw new LoginException("Failed to create principal: "
-						+ e.getMessage());
-			}
-			if (algorithm != null) {
-				password = createPasswordHash(username, password);
-			}
-			String expectedPassword = getUsersPassword();
-			if (!validatePassword(password, expectedPassword)) {
-				throw new FailedLoginException(
-						"Password Incorrect/Password Required");
-			}
-		}
-		if (getUseFirstPass()) {
-			sharedState.put("javax.security.auth.login.name", username);
-			sharedState.put("javax.security.auth.login.password", passport);
-		}
-		loginOk = true;
-		return loginOk;
-	}
-
-	protected String[] getUsernameAndPassword() throws LoginException {
-		String usernamePassword[] = { null, null };
-		if (callbackHandler == null) {
-			throw new LoginException(
-					"Error occurs: there are no CallbackHandler available to get information about authentication");
-		}
-		String username = null;
-		String password = null;
-		try {
-			Callback callbacks[] = { new NameCallback("Username: "), new PasswordCallback("Password: ", false) };
-			callbackHandler.handle(callbacks);
-			NameCallback nameCallback = (NameCallback) callbacks[0];
-			PasswordCallback passwordCallback = (PasswordCallback) callbacks[1];
-			username = nameCallback.getName();
-			char helperPassword[] = passwordCallback.getPassword();
-			if (helperPassword != null) {
-				passport = new char[helperPassword.length];
-				System.arraycopy(helperPassword, 0, passport, 0,
-						helperPassword.length);
-				passwordCallback.clearPassword();
-				password = new String(passport);
-			}
-		} catch (IOException ioe) {
-			throw new LoginException(ioe.toString());
-		} catch (UnsupportedCallbackException uce) {
-			throw new LoginException("CallbackHandler does not support: "
-					+ uce.getCallback());
-		}
-		usernamePassword[USERNAME_POS] = username;
-		usernamePassword[PASSWORD_POS] = password;
-		return usernamePassword;
-	}
-
-	protected boolean validatePassword(String inputPassword,
-			String expectedPassword) {
-		if (inputPassword == null || expectedPassword == null) {
-			return false;
-		}
-		return ignorePasswordCase ? inputPassword
-				.equalsIgnoreCase(expectedPassword) : inputPassword
-				.equals(expectedPassword);
-	}
-
-	protected String createPasswordHash(String username, String password) {
-		DigestCallback callback = null;
-		String callbackClassName = (String) options.get("digestCallback");
-		if (callbackClassName != null) {
-			try {
-				Class callbackClass = loadSomeClass(callbackClassName);
-				callback = (DigestCallback) callbackClass.newInstance();
-			} catch (Exception e) {
-				SecurityException securityExeption = new SecurityException(
-						"Cannot load DigestCallback");
-				securityExeption.initCause(e);
-				throw securityExeption;
-			}
-			HashMap optionsMap = new HashMap(options);
-			optionsMap.put("javax.security.auth.login.name", username);
-			optionsMap.put("javax.security.auth.login.password", password);
-			callback.init(optionsMap);
-		}
-
-		return PasswordHasher.calculateHash(algorithm, encoding, charset,
-				username, password, callback);
-	}
-
-	protected boolean getUseFirstPass() {
-		return useFirstPass;
-	}
-
-	protected Principal getUnauthenticatedIdentity() {
-		return unauthenticatedIdentity;
-	}
-
-	protected Object getCredentials() {
-		return passport;
-	}
-
-	public boolean logout() throws LoginException {
-		Principal identity = getIdentity();
-		Set principals = subject.getPrincipals();
-		principals.remove(identity);
-		return true;
-	}
-
-	protected Principal createIdentity(String username) throws Exception {
-		Principal principal = null;
-		if (principalClassName != null) {
-			Class loadedClass = loadSomeClass(principalClassName);
-			Class signatures[] = { java.lang.String.class };
-			Constructor constructorInstance = loadedClass
-					.getConstructor(signatures);
-			Object argumentsForConstructor[] = { username };
-			principal = (Principal) constructorInstance
-					.newInstance(argumentsForConstructor);
-		} else {
-			principal = new GeronimoUserPrincipal(username);
-		}
-		return principal;
-	}
-
-	private Class loadSomeClass(String classname) throws ClassNotFoundException {
-		ClassLoader loader = Thread.currentThread().getContextClassLoader();
-		return loader.loadClass(classname);
-	}
-
-	protected String getUsername() {
-		return (getIdentity() != null) ? getIdentity().getName() : null;
-	}
-
-	protected Group createGroup(String name, Set principals) {
-		Group roles = null;
-		Iterator principalsIter = principals.iterator();
-		while (principalsIter.hasNext()) {
-			Object next = principalsIter.next();
-			if (next instanceof Group) {
-				Group nextGroup = (Group) next;
-				if (nextGroup.getName().equals(name)) {
-					roles = nextGroup;
-					break;
-				}
-			}
-		}
-		if (roles == null) {
-			roles = new GeronimoSimpleGroup(name);
-			principals.add(roles);
-		}
-		return roles;
-	}
-
-	protected abstract String getUsersPassword() throws LoginException;
-
-	protected abstract Group[] getRoleSets() throws LoginException;
-}
\ No newline at end of file

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/src/org/apache/geronimo/j2g/sources/dependence/compatibility/GeronimoSimpleGroup.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/src/org/apache/geronimo/j2g/sources/dependence/compatibility/GeronimoSimpleGroup.java?view=diff&rev=551566&r1=551565&r2=551566
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/src/org/apache/geronimo/j2g/sources/dependence/compatibility/GeronimoSimpleGroup.java (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/src/org/apache/geronimo/j2g/sources/dependence/compatibility/GeronimoSimpleGroup.java Thu Jun 28 07:14:50 2007
@@ -1,97 +0,0 @@
-/**
- *  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.
- */
- /*
- * Auto-generated by J2G Migration. 
- */
-package org.apache.geronimo.j2g.sources.dependence.compatibility;
-
-import java.security.Principal;
-import java.security.acl.Group;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
-
-import org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal;
-
-public class GeronimoSimpleGroup extends GeronimoGroupPrincipal implements Group {
-
-	/**
-	 * Serial ID.
-	 */
-	private static final long serialVersionUID = 4220122854158936883L;
-
-	private HashMap members;
-
-	public GeronimoSimpleGroup(String name) {
-		super(name);
-		members = new HashMap(3);
-	}
-
-	public boolean addMember(Principal user) {
-		boolean isMember = members.containsKey(user);
-		if (!isMember) {
-			members.put(user, user);
-		}
-		return !isMember;
-	}
-
-	public boolean isMember(Principal member) {
-		boolean isMember = members.containsKey(member);
-		if (!isMember) {
-			isMember = member instanceof Anybody;
-			if (!isMember && (member instanceof Nobody)) {
-				return false;
-			}
-		}
-
-		if (!isMember) {
-			Collection values = members.values();
-			Iterator iter = values.iterator();
-			do {
-				if (isMember || !iter.hasNext()) {
-					break;
-				}
-				Object next = iter.next();
-				if (next instanceof Group) {
-					Group group = (Group) next;
-					isMember = group.isMember(member);
-				}
-			} while (true);
-		}
-		return isMember;
-	}
-
-	public Enumeration members() {
-		return Collections.enumeration(members.values());
-	}
-
-	public boolean removeMember(Principal user) {
-		return (members.remove(user) != null);
-	}
-
-	public String toString() {
-		String tmp = new String(getName());
-		tmp.concat("(MEMBERS:");
-		for (Iterator iter = members.keySet().iterator(); iter.hasNext(); tmp.concat(",")) {
-			tmp.concat(iter.next().toString());
-		}
-		tmp.concat(")");
-		return tmp.toString();
-	}
-}

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/src/org/apache/geronimo/j2g/sources/dependence/compatibility/Nobody.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/src/org/apache/geronimo/j2g/sources/dependence/compatibility/Nobody.java?view=diff&rev=551566&r1=551565&r2=551566
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/src/org/apache/geronimo/j2g/sources/dependence/compatibility/Nobody.java (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/src/org/apache/geronimo/j2g/sources/dependence/compatibility/Nobody.java Thu Jun 28 07:14:50 2007
@@ -1,51 +0,0 @@
-/**
- *  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.
- */
- /*
- * Auto-generated by J2G Migration. 
- */
-package org.apache.geronimo.j2g.sources.dependence.compatibility;
-
-import java.security.Principal;
-
-public class Nobody implements Comparable, Principal {
-	public static final String NOBODY = "<NOBODY>";
-
-	public static final Nobody NOBODY_PRINCIPAL = new Nobody();
-
-	public Nobody() {
-	}
-
-	public int hashCode() {
-		return NOBODY.hashCode();
-	}
-
-	public String getName() {
-		return NOBODY;
-	}
-
-	public String toString() {
-		return NOBODY;
-	}
-
-	public boolean equals(Object another) {
-		return false;
-	}
-
-	public int compareTo(Object o) {
-		return 1;
-	}
-}
\ No newline at end of file

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/src/org/apache/geronimo/j2g/sources/dependence/compatibility/PasswordHasher.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/src/org/apache/geronimo/j2g/sources/dependence/compatibility/PasswordHasher.java?view=diff&rev=551566&r1=551565&r2=551566
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/src/org/apache/geronimo/j2g/sources/dependence/compatibility/PasswordHasher.java (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.dependence/src/org/apache/geronimo/j2g/sources/dependence/compatibility/PasswordHasher.java Thu Jun 28 07:14:50 2007
@@ -1,103 +0,0 @@
-/**
- *  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.
- */
- /*
- * Auto-generated by J2G Migration. 
- */
-package org.apache.geronimo.j2g.sources.dependence.compatibility;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.security.MessageDigest;
-
-import org.apache.geronimo.util.encoders.Base64Encoder;
-
-public class PasswordHasher {
-	
-	private final static String HEX_ENC = "HEX";
-	private final static String ISO_ENC = "ISO-8859-1";
-	private final static String BASE_64_ENC = "BASE64";
-	
-	public static String calculateHash(String algorithm, String encoding, String charset, String username, String password, DigestCallback callback) {
-		String passwordHash = null;
-		byte passBytes[];
-		try {
-			if (charset == null) {
-				passBytes = password.getBytes();
-			}
-			else {
-				passBytes = password.getBytes(charset);
-			}
-		} catch (UnsupportedEncodingException uee) {
-			passBytes = password.getBytes();
-		}
-		try {
-			MessageDigest mesDigest = MessageDigest.getInstance(algorithm);
-			if (callback != null) {
-				callback.preDigest(mesDigest);
-			}
-			mesDigest.update(passBytes);
-			if (callback != null) {
-				callback.postDigest(mesDigest);
-			}
-			byte hash[] = mesDigest.digest();
-			if (encoding.equalsIgnoreCase(HEX_ENC)) {
-				passwordHash = base16Encoding(hash);
-			} else if (encoding.equalsIgnoreCase(BASE_64_ENC)) {
-				passwordHash = base64Encoding(hash);
-			}
-		} catch (Exception e) {}
-		return passwordHash;
-	}
-
-	private static String base16Encoding(byte encodedChain[]) {
-		StringBuffer buffer = new StringBuffer(encodedChain.length * 2);
-		for (int i = 0; i < encodedChain.length; i++) {
-			byte nextByte = encodedChain[i];
-			char nextChar = (char) (nextByte >> 4 & 0xf);
-			if (nextChar > '\t') {
-				nextChar = (char) ((nextChar - 10) + 97);
-			}
-			else {
-				nextChar += '0';
-			}
-			buffer.append(nextChar);
-			nextChar = (char) (nextByte & 0xf);
-			if (nextChar > '\t') {
-				nextChar = (char) ((nextChar - 10) + 97);
-			}
-			else {
-				nextChar += '0';
-			}
-			buffer.append(nextChar);
-		}
-		return buffer.toString();
-	}
-
-	private static String base64Encoding(byte bytes[]) {
-		ByteArrayOutputStream out = new ByteArrayOutputStream();
-		Base64Encoder encoder = new Base64Encoder();
-		try {
-			encoder.encode(bytes, 0, bytes.length, out);
-		} catch (IOException e) {}
-		String result = null;
-		try {
-			result = out.toString(ISO_ENC);
-		} catch (UnsupportedEncodingException e) {}
-		return result;
-	}
-}

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.environment/.classpath
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.environment/.classpath?view=diff&rev=551566&r1=551565&r2=551566
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.environment/.classpath (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.environment/.classpath Thu Jun 28 07:14:50 2007
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.environment/.project
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.environment/.project?view=diff&rev=551566&r1=551565&r2=551566
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.environment/.project (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.environment/.project Thu Jun 28 07:14:50 2007
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.apache.geronimo.j2g.sources.environment</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.environment/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.environment/META-INF/MANIFEST.MF?view=diff&rev=551566&r1=551565&r2=551566
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.environment/META-INF/MANIFEST.MF (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.environment/META-INF/MANIFEST.MF Thu Jun 28 07:14:50 2007
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: J2G EJB Environment Plug-in
-Bundle-SymbolicName: org.apache.geronimo.j2g.sources.environment;singleton:=true
-Bundle-Version: 1.0.0
-Bundle-Vendor: Apache.org
-Bundle-Localization: plugin
-Require-Bundle: org.apache.geronimo.j2g.sources,
- org.eclipse.jdt,
- org.eclipse.jdt.core,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.jface.text,
- org.apache.geronimo.j2g.common,
- org.apache.geronimo.j2g.util
-Bundle-ClassPath: .
-Export-Package: org.apache.geronimo.j2g.sources.environment

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.environment/build.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.environment/build.properties?view=diff&rev=551566&r1=551565&r2=551566
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.environment/build.properties (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.environment/build.properties Thu Jun 28 07:14:50 2007
@@ -1,21 +0,0 @@
-/**
- *  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.
- */
- source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.environment/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.environment/plugin.xml?view=diff&rev=551566&r1=551565&r2=551566
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.environment/plugin.xml (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.environment/plugin.xml Thu Jun 28 07:14:50 2007
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<!--
-  ~ 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.
-  -->
-<plugin>
-   <extension
-         point="org.apache.geronimo.j2g.sources.migrations">
-      <migration class="org.apache.geronimo.j2g.sources.environment.EjbEnvJavaMigration"/>
-   </extension>
-
-</plugin>

Modified: geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.environment/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.environment/pom.xml?view=diff&rev=551566&r1=551565&r2=551566
==============================================================================
--- geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.environment/pom.xml (original)
+++ geronimo/sandbox/j2g/plugins/org.apache.geronimo.j2g.sources.environment/pom.xml Thu Jun 28 07:14:50 2007
@@ -60,3 +60,65 @@
        	</dependency>
     </dependencies>
 </project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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.
+  -->
+<!-- $Rev$ $Date$ -->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.geronimo.tools</groupId>
+    <artifactId>org.apache.geronimo.j2g.sources.environment</artifactId>
+    <packaging>jar</packaging>
+    <name>${artifactId}</name>
+    <parent>
+        <groupId>org.apache.geronimo.tools</groupId>
+        <artifactId>j2g-plugins</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.devtools</groupId>
+                <artifactId>maven-eclipsepde-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+		<dependency>
+            <groupId>org.apache.geronimo.tools</groupId>
+            <artifactId>org.apache.geronimo.j2g.common</artifactId>
+            <version>${version}</version>
+       	</dependency>
+       	<dependency>
+            <groupId>org.apache.geronimo.tools</groupId>
+            <artifactId>org.apache.geronimo.j2g.util</artifactId>
+           	<version>${version}</version>
+       	</dependency>
+       	<dependency>
+            <groupId>org.apache.geronimo.tools</groupId>
+            <artifactId>org.apache.geronimo.j2g.sources</artifactId>
+           	<version>${version}</version>
+       	</dependency>
+    </dependencies>
+</project>



Mime
View raw message