[mapguide-commits] r7297 - in trunk/MgDev: . BuildTools BuildTools/WebTools/IMake BuildTools/WebTools/IMake/Win32 Common/Foundation/Data Common/MapGuideCommon/Services Common/PlatformBase/Services Oem/SQLite/src/SQLitePhpApi Oem/SWIGEx/Source/Modules Oem/SWIGEx/Win32 UnitTest/Common UnitTest/Common/JavaApiExTest UnitTest/Common/JavaApiExTest/.idea UnitTest/Common/JavaApiExTest/.idea/copyright UnitTest/Common/JavaApiExTest/.idea/inspectionProfiles UnitTest/Common/JavaApiExTest/.idea/scopes UnitTest/Common/JavaApiExTest/src Web/src Web/src/DotNetApi/Foundation Web/src/DotNetApi/Geometry Web/src/DotNetApi/MapGuideCommon Web/src/DotNetApi/PlatformBase Web/src/DotNetApi/Web Web/src/DotNetUnmanagedApi/Foundation Web/src/DotNetUnmanagedApi/Geometry Web/src/DotNetUnmanagedApi/MapGuideCommon Web/src/DotNetUnmanagedApi/PlatformBase Web/src/DotNetUnmanagedApi/Web Web/src/JavaApiEx Web/src/JavaApiEx/org Web/src/JavaApiEx/org/osgeo Web/src/JavaApiEx/org/osgeo/mapguide Web/src/MapGuideApi
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Fri Jan 11 19:36:04 PST 2013
Author: jng
Date: 2013-01-11 19:36:03 -0800 (Fri, 11 Jan 2013)
New Revision: 7297
Added:
trunk/MgDev/UnitTest/Common/JavaApiExTest/
trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/
trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/.name
trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/ant.xml
trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/compiler.xml
trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/copyright/
trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/copyright/profiles_settings.xml
trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/encodings.xml
trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/inspectionProfiles/
trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/misc.xml
trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/modules.xml
trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/scopes/
trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/scopes/scope_settings.xml
trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/uiDesigner.xml
trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/vcs.xml
trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/workspace.xml
trunk/MgDev/UnitTest/Common/JavaApiExTest/MapGuideApiExTest.iml
trunk/MgDev/UnitTest/Common/JavaApiExTest/src/
trunk/MgDev/UnitTest/Common/JavaApiExTest/src/AssertException.java
trunk/MgDev/UnitTest/Common/JavaApiExTest/src/MapGuideApiTest.java
trunk/MgDev/Web/src/JavaApiEx/
trunk/MgDev/Web/src/JavaApiEx/COPYRIGHT
trunk/MgDev/Web/src/JavaApiEx/DIFFERENCES.txt
trunk/MgDev/Web/src/JavaApiEx/JavaApiEx.rc
trunk/MgDev/Web/src/JavaApiEx/JavaApiEx.vcxproj
trunk/MgDev/Web/src/JavaApiEx/Makefile.am
trunk/MgDev/Web/src/JavaApiEx/catchall.code
trunk/MgDev/Web/src/JavaApiEx/getclassid.code
trunk/MgDev/Web/src/JavaApiEx/java.i
trunk/MgDev/Web/src/JavaApiEx/javaextensions.i
trunk/MgDev/Web/src/JavaApiEx/org/
trunk/MgDev/Web/src/JavaApiEx/org/osgeo/
trunk/MgDev/Web/src/JavaApiEx/org/osgeo/mapguide/
trunk/MgDev/Web/src/JavaApiEx/org/osgeo/mapguide/AppThrowable.java
trunk/MgDev/Web/src/JavaApiEx/org/osgeo/mapguide/MgBase64.java
trunk/MgDev/Web/src/JavaApiEx/org/osgeo/mapguide/MgLocalizer.java
Removed:
trunk/MgDev/BuildTools/DoxyTransform/
trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/
trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/.name
trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/ant.xml
trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/compiler.xml
trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/copyright/
trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/copyright/profiles_settings.xml
trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/encodings.xml
trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/inspectionProfiles/
trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/misc.xml
trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/modules.xml
trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/scopes/
trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/scopes/scope_settings.xml
trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/uiDesigner.xml
trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/vcs.xml
trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/workspace.xml
trunk/MgDev/UnitTest/Common/JavaApiExTest/MapGuideApiExTest.iml
trunk/MgDev/UnitTest/Common/JavaApiExTest/src/
trunk/MgDev/UnitTest/Common/JavaApiExTest/src/AssertException.java
trunk/MgDev/UnitTest/Common/JavaApiExTest/src/MapGuideApiTest.java
trunk/MgDev/Web/src/JavaApiEx/COPYRIGHT
trunk/MgDev/Web/src/JavaApiEx/DIFFERENCES.txt
trunk/MgDev/Web/src/JavaApiEx/JavaApiEx.rc
trunk/MgDev/Web/src/JavaApiEx/JavaApiEx.vcxproj
trunk/MgDev/Web/src/JavaApiEx/Makefile.am
trunk/MgDev/Web/src/JavaApiEx/catchall.code
trunk/MgDev/Web/src/JavaApiEx/getclassid.code
trunk/MgDev/Web/src/JavaApiEx/java.i
trunk/MgDev/Web/src/JavaApiEx/javaextensions.i
trunk/MgDev/Web/src/JavaApiEx/org/
trunk/MgDev/Web/src/JavaApiEx/org/osgeo/
trunk/MgDev/Web/src/JavaApiEx/org/osgeo/mapguide/
trunk/MgDev/Web/src/JavaApiEx/org/osgeo/mapguide/AppThrowable.java
trunk/MgDev/Web/src/JavaApiEx/org/osgeo/mapguide/MgBase64.java
trunk/MgDev/Web/src/JavaApiEx/org/osgeo/mapguide/MgLocalizer.java
Modified:
trunk/MgDev/BuildTools/WebTools/IMake/IMake.cpp
trunk/MgDev/BuildTools/WebTools/IMake/Win32/IMake.exe
trunk/MgDev/BuildTools/WebTools/IMake/stdafx.h
trunk/MgDev/Common/Foundation/Data/PropertyDefinition.h
trunk/MgDev/Common/MapGuideCommon/Services/MappingService.h
trunk/MgDev/Common/PlatformBase/Services/ClassDefinition.h
trunk/MgDev/Common/PlatformBase/Services/FeatureSchema.h
trunk/MgDev/Oem/SQLite/src/SQLitePhpApi/SQliteApiGen.xml
trunk/MgDev/Oem/SWIGEx/Source/Modules/java.cxx
trunk/MgDev/Oem/SWIGEx/Source/Modules/main.cxx
trunk/MgDev/Oem/SWIGEx/Win32/Swig.exe
trunk/MgDev/Web/src/DotNetApi/Foundation/FoundationMakefile
trunk/MgDev/Web/src/DotNetApi/Geometry/GeometryMakefile
trunk/MgDev/Web/src/DotNetApi/MapGuideCommon/MapGuideCommonMakefile
trunk/MgDev/Web/src/DotNetApi/PlatformBase/PlatformBaseMakefile
trunk/MgDev/Web/src/DotNetApi/Web/WebMakefile
trunk/MgDev/Web/src/DotNetUnmanagedApi/Foundation/FoundationApiGen.xml
trunk/MgDev/Web/src/DotNetUnmanagedApi/Geometry/GeometryApiGen.xml
trunk/MgDev/Web/src/DotNetUnmanagedApi/MapGuideCommon/MapGuideCommonApiGen.xml
trunk/MgDev/Web/src/DotNetUnmanagedApi/PlatformBase/PlatformBaseApiGen.xml
trunk/MgDev/Web/src/DotNetUnmanagedApi/Web/WebApiGen.xml
trunk/MgDev/Web/src/Makefile.am
trunk/MgDev/Web/src/MapGuideApi/MapGuideApiGen.xml
trunk/MgDev/Web/src/WebTier_VS2010.sln
trunk/MgDev/build.bat
trunk/MgDev/build64.bat
trunk/MgDev/configure.in
Log:
Merge RFC 129 to trunk from our sandbox
Modified: trunk/MgDev/BuildTools/WebTools/IMake/IMake.cpp
===================================================================
--- trunk/MgDev/BuildTools/WebTools/IMake/IMake.cpp 2013-01-09 19:09:42 UTC (rev 7296)
+++ trunk/MgDev/BuildTools/WebTools/IMake/IMake.cpp 2013-01-12 03:36:03 UTC (rev 7297)
@@ -12,21 +12,24 @@
java
};
-static char version[] = "1.1";
+static char version[] = "1.2";
static string module;
static string customPath;
static string target;
+static string docTarget;
static string cppInline;
static string swigInline;
static string typedefs;
static string nameSpace;
static string package;
+static set<string> classesWithDocs;
static map<string, string> typeReplacements;
static map<string, bool> classes;
static vector<string> headers;
static map<string, int> rootObjectMethods;
static FILE* outfile;
+static FILE* docOutFile;
static char charbuf[2];
static bool translateMode;
static Language language;
@@ -75,6 +78,15 @@
return attr->value;
}
+string parseDocTarget(XNode* elt)
+{
+ LPXAttr attr = elt->GetAttr("path");
+ if(attr == NULL)
+ error("DocTarget element does not have a 'path' attribute");
+
+ return attr->value;
+}
+
string parseCppInline(XNode* elt)
{
string text = Trim(elt->GetText());
@@ -204,6 +216,12 @@
error("Target is not a valid section in translation mode");
target = parseTarget(node);
}
+ else if(node->name == "DocTarget")
+ {
+ if(translateMode)
+ error("DocTarget is not a valid section in translation mode");
+ docTarget = parseDocTarget(node);
+ }
else if(node->name == "CppInline")
{
if(translateMode)
@@ -336,6 +354,7 @@
break;
case '/':
+ /*
if(!translateMode)
{
if(i < (int)input.length() - 1 && input[i + 1] == '/')
@@ -343,7 +362,7 @@
else
tokens.push_back("/");
}
- else
+ else*/
{
if(input[i + 1] == '/')
{
@@ -512,6 +531,596 @@
return itMethod != rootObjectMethods.end();
}
+bool isAllSlashes(const string& str)
+{
+ for (int i = 0; i < str.length(); i++) {
+ if (str[i] != '/')
+ return false;
+ }
+ return str.length() > 3; //A "///" does not count
+}
+
+string linkifyCSharpDocFragment(const string& str)
+{
+ // Explode the fragment into a space delimited list.
+ // Go through the delimited tokens and surround any
+ // token containing "Mg" with {@link <token>}
+ //
+ // Re-combine each delimited token to form the linkified result
+ std::vector<std::string> elems;
+ std::stringstream ss(str);
+ std::string item;
+ while(std::getline(ss, item, ' ')) {
+ //We can't process these yet, so skip them as they may
+ //interfere with doxygen directive translation
+ if (item == "\\link" || item == "\\endlink")
+ continue;
+ elems.push_back(item);
+ }
+
+ std::string nspace = nameSpace;
+ if (nspace.empty()) //Faulty logic if this is the case
+ nspace = "OSGeo.MapGuide";
+
+ std::string output;
+ for (int i = 0; i < elems.size(); i++) {
+ if (i != 0) {
+ output.append(" ");
+ }
+ //If it contains "Mg", assume it's a MapGuide class name and link-ify it
+ //TODO: Resolve :: to member links. Right now it just linkifies the Mg class name
+ int idx = elems[i].find("Mg");
+ if (idx != std::string::npos) {
+ std::string prefix;
+ std::string mgClassName;
+ std::string suffix;
+ //Collect characters before Mg
+ if (idx > 0) {
+ prefix = elems[i].substr(0, idx);
+ }
+ int cont = -1;
+ //Collect the characters in the MapGuide class name
+ for (int j = idx; j < elems[i].length(); j++) {
+ if (!isalnum(elems[i][j])) {
+ cont = j;
+ break;
+ } else {
+ mgClassName += elems[i][j];
+ }
+ }
+ //Collect any characters afterwards
+ for (int j = cont; j < elems[i].length(); j++) {
+ suffix += elems[i][j];
+ }
+ output.append(prefix);
+ output.append("<see cref=\"");
+ output.append(nspace);
+ output.append(".");
+ output.append(mgClassName);
+ output.append("\" />");
+ output.append(suffix);
+ } else {
+ output.append(elems[i]);
+ }
+ }
+ return output;
+}
+
+string linkifyJavaDocFragment(const string& str)
+{
+ // Explode the fragment into a space delimited list.
+ // Go through the delimited tokens and surround any
+ // token containing "Mg" with {@link <token>}
+ //
+ // Re-combine each delimited token to form the linkified result
+ std::vector<std::string> elems;
+ std::stringstream ss(str);
+ std::string item;
+ while(std::getline(ss, item, ' ')) {
+ //We can't process these yet, so skip them as they may
+ //interfere with doxygen directive translation
+ if (item == "\\link" || item == "\\endlink")
+ continue;
+ elems.push_back(item);
+ }
+ std::string output;
+ for (int i = 0; i < elems.size(); i++) {
+ if (i != 0) {
+ output.append(" ");
+ }
+ //If it contains "Mg", assume it's a MapGuide class name and link-ify it
+ //TODO: Resolve :: to member links. Right now it just linkifies the Mg class name
+ int idx = elems[i].find("Mg");
+ if (idx != std::string::npos) {
+ std::string prefix;
+ std::string mgClassName;
+ std::string suffix;
+ //Collect characters before Mg
+ if (idx > 0) {
+ prefix = elems[i].substr(0, idx);
+ }
+ int cont = -1;
+ //Collect the characters in the MapGuide class name
+ for (int j = idx; j < elems[i].length(); j++) {
+ if (!isalnum(elems[i][j])) {
+ cont = j;
+ break;
+ } else {
+ mgClassName += elems[i][j];
+ }
+ }
+ //Collect any characters afterwards
+ for (int j = cont; j < elems[i].length(); j++) {
+ suffix += elems[i][j];
+ }
+ output.append(prefix);
+ output.append("{@link ");
+ output.append(mgClassName);
+ output.append("}");
+ output.append(suffix);
+ } else {
+ output.append(elems[i]);
+ }
+ }
+ return output;
+}
+
+string doxygenToJavaDoc(const string& commentStr)
+{
+ // Doxygen documentation translation overview:
+ //
+ // What sorcery allows us to transplant doxygen documentation to our target language of choice?
+ //
+ // The answer lies in the swig directives %javamethodmodifiers and %typemap(javaclassmodifiers)
+ // (and its csharp equvialents %csmethodmodifiers and %typemap(csclassmodifiers))
+ //
+ // The official SWIG documentation says that these directives are used to modify the visibility modifier for
+ // <class declaration|class method name>. Although this directive is mainly used to modify
+ // class/method visibility, the content itself does not have to be public/protected/abstract/static/const/etc
+ // SWIG itself does not do any validation of the content in this directive.
+ //
+ // Given this directive
+ //
+ // %javamethodmodifiers MgMyClass::MyMethod() <content>
+ //
+ // SWIG generates this (Java):
+ //
+ // public class MgMyClass {
+ // ...
+ // <content> MyMethod() {
+ // ...
+ // }
+ // ...
+ // }
+ //
+ // <content> should generally be public/protected/abstract/static/const/etc, but SWIG does not validate or enforce this
+ //
+ // Therefore we (ab)use these SWIG directives to prepend arbitrary content to the generated proxy class declaration/methods. In our
+ // case, the content being our doxygen commentary (collected by IMake) translated to the target-specific documentation format
+ //
+ // In fact, this technique is documented as a way of transplanting documentation:
+ // http://www.swig.org/Doc1.3/Java.html#javadoc_comments
+
+ // Supported doxygen tags:
+ // \brief - Converted to main javadoc body
+ // \param - @param
+ // \return - @return
+ // \deprecated - Adds the @Deprecated annotation to the class/method declaration (after the converted javadoc)
+ // \since - @since
+ // \exception - @exception
+
+ //Re-tokenize the doxygen comments
+ std::vector<std::string> elems;
+ std::stringstream ss(commentStr);
+ std::string item;
+ while(std::getline(ss, item, '\n')) {
+ elems.push_back(item);
+ }
+ int i = 0;
+
+ bool isDeprecated = false;
+ std::vector<std::string> descriptionParts;
+ std::vector<std::string> paramParts;
+ std::vector<std::string> returnParts;
+ std::string sinceVer;
+ std::vector<std::string> exceptionParts;
+
+ while(i < elems.size()) {
+ if (elems[i].find("<!-- Syntax in .Net, Java, and PHP -->") != std::string::npos ||
+ elems[i].find("<!-- Example (PHP) -->") != std::string::npos ||
+ elems[i].find("<!-- Example (Java) -->") != std::string::npos ||
+ elems[i].find("<!-- Example (C#) -->") != std::string::npos) {
+ i++;
+ continue;
+ }
+
+ if (elems[i].find("\\brief") != std::string::npos) {
+ i++;
+ //Keep going until we find the next doxygen directive or end of comments
+ while (i < elems.size() && elems[i].find("\\") == std::string::npos) {
+ if (elems[i].find("<!-- Syntax in .Net, Java, and PHP -->") != std::string::npos ||
+ elems[i].find("<!-- Example (PHP) -->") != std::string::npos ||
+ elems[i].find("<!-- Example (Java) -->") != std::string::npos ||
+ elems[i].find("<!-- Example (C#) -->") != std::string::npos) {
+ i++;
+ continue;
+ }
+ std::string token = elems[i].substr(3);
+ if (!token.empty())
+ descriptionParts.push_back(token);
+ i++;
+ }
+
+ continue;
+ }
+ else if (elems[i].find("\\param") != std::string::npos) {
+ std::string paramPart = elems[i].substr(elems[i].find("\\param") + 6);
+ paramPart.append(" ");
+ i++;
+ //Keep going until we find the next doxygen directive or end of comments
+ while (i < elems.size() && elems[i].find("\\") == std::string::npos) {
+ std::string token = elems[i].substr(3);
+ if (!token.empty()) {
+ paramPart.append(token);
+ paramPart.append(" ");
+ }
+ i++;
+ }
+ paramParts.push_back(paramPart);
+ continue;
+ }
+ else if (elems[i].find("\\return") != std::string::npos) {
+ i++;
+ //Keep going until we find the next doxygen directive or end of comments
+ while (i < elems.size() && elems[i].find("\\") == std::string::npos) {
+ if (elems[i].find("<!-- Syntax in .Net, Java, and PHP -->") != std::string::npos ||
+ elems[i].find("<!-- Example (PHP) -->") != std::string::npos ||
+ elems[i].find("<!-- Example (Java) -->") != std::string::npos ||
+ elems[i].find("<!-- Example (C#) -->") != std::string::npos) {
+ i++;
+ continue;
+ }
+ std::string token = elems[i].substr(3);
+ if (!token.empty())
+ returnParts.push_back(token);
+ i++;
+ }
+ continue;
+ }
+ else if (elems[i].find("\\deprecated") != std::string::npos) {
+ i++;
+ isDeprecated = true;
+ continue;
+ }
+ else if (elems[i].find("\\since") != std::string::npos) {
+ sinceVer = elems[i].substr(elems[i].find("\\since") + 6);
+ i++;
+ continue;
+ }
+ else if (elems[i].find("\\exception") != std::string::npos) {
+ std::string except = elems[i].substr(elems[i].find("\\exception") + 10);
+ exceptionParts.push_back(except);
+ i++;
+ continue;
+ }
+ i++;
+ }
+
+ // ---------------------- JAVADOC START ------------------------ //
+ std::string javaDoc = "\n/**\n";
+
+ if (descriptionParts.size() > 0) {
+ for (int i = 0; i < descriptionParts.size(); i++) {
+ javaDoc.append(" *");
+ javaDoc.append(linkifyJavaDocFragment(descriptionParts[i]));
+ javaDoc.append("\n");
+ }
+ javaDoc.append(" *\n");
+ } else {
+ javaDoc.append(" * TODO: API Documentation is missing or failed to translate doxygen brief directive (message inserted by IMake.exe)\n");
+ }
+
+ if (paramParts.size() > 0) {
+ for (int i = 0; i < paramParts.size(); i++) {
+ javaDoc.append(" * @param ");
+ javaDoc.append(linkifyJavaDocFragment(paramParts[i]));
+ javaDoc.append("\n");
+ }
+ }
+
+ if (returnParts.size() > 0) {
+ javaDoc.append(" * @return ");
+ for (int i = 0; i < returnParts.size(); i++) {
+ javaDoc.append(linkifyJavaDocFragment(returnParts[i]));
+ if (i < returnParts.size() - 1)
+ javaDoc.append("\n * ");
+ }
+ javaDoc.append("\n");
+ }
+
+ if (exceptionParts.size() > 0) {
+ for (int i = 0; i < exceptionParts.size(); i++) {
+ javaDoc.append(" * @exception ");
+ javaDoc.append(exceptionParts[i]);
+ javaDoc.append("\n");
+ }
+ }
+
+ if (!sinceVer.empty()) {
+ javaDoc.append(" * @since ");
+ javaDoc.append(sinceVer);
+ }
+
+ // ---------------------- JAVADOC END ------------------------ //
+ javaDoc.append(" */\n");
+ if (isDeprecated)
+ javaDoc.append("@Deprecated\n");
+ return javaDoc;
+}
+
+string doxygenToCsharpDoc(const string& commentStr)
+{
+ //See doxygenToJavaDoc for how we do this sorcery
+
+ std::string nspace = nameSpace;
+ if (nspace.empty()) //Faulty logic if this is the case
+ nspace = "OSGeo.MapGuide";
+
+ //Re-tokenize the doxygen comments
+ std::vector<std::string> elems;
+ std::stringstream ss(commentStr);
+ std::string item;
+ while(std::getline(ss, item, '\n')) {
+ elems.push_back(item);
+ }
+ int i = 0;
+
+ bool isDeprecated = false;
+ std::vector<std::string> descriptionParts;
+ std::vector<std::string> paramParts;
+ std::vector<std::string> returnParts;
+ std::vector<std::string> exceptionParts;
+
+ while(i < elems.size()) {
+ if (elems[i].find("<!-- Syntax in .Net, Java, and PHP -->") != std::string::npos ||
+ elems[i].find("<!-- Example (PHP) -->") != std::string::npos ||
+ elems[i].find("<!-- Example (Java) -->") != std::string::npos ||
+ elems[i].find("<!-- Example (C#) -->") != std::string::npos) {
+ i++;
+ continue;
+ }
+
+ if (elems[i].find("\\brief") != std::string::npos) {
+ i++;
+ //Keep going until we find the next doxygen directive or end of comments
+ while (i < elems.size() && elems[i].find("\\") == std::string::npos) {
+ if (elems[i].find("<!-- Syntax in .Net, Java, and PHP -->") != std::string::npos ||
+ elems[i].find("<!-- Example (PHP) -->") != std::string::npos ||
+ elems[i].find("<!-- Example (Java) -->") != std::string::npos ||
+ elems[i].find("<!-- Example (C#) -->") != std::string::npos) {
+ i++;
+ continue;
+ }
+ std::string token = elems[i].substr(3);
+ if (!token.empty())
+ descriptionParts.push_back(token);
+ i++;
+ }
+
+ continue;
+ }
+ else if (elems[i].find("\\param") != std::string::npos) {
+ std::string paramPart = elems[i].substr(elems[i].find("\\param") + 6);
+ paramPart.append(" ");
+ i++;
+ //Keep going until we find the next doxygen directive or end of comments
+ while (i < elems.size() && elems[i].find("\\") == std::string::npos) {
+ std::string token = elems[i].substr(3);
+ if (!token.empty()) {
+ paramPart.append(token);
+ paramPart.append(" ");
+ }
+ i++;
+ }
+ paramParts.push_back(paramPart);
+ continue;
+ }
+ else if (elems[i].find("\\return") != std::string::npos) {
+ i++;
+ //Keep going until we find the next doxygen directive or end of comments
+ while (i < elems.size() && elems[i].find("\\") == std::string::npos) {
+ if (elems[i].find("<!-- Syntax in .Net, Java, and PHP -->") != std::string::npos ||
+ elems[i].find("<!-- Example (PHP) -->") != std::string::npos ||
+ elems[i].find("<!-- Example (Java) -->") != std::string::npos ||
+ elems[i].find("<!-- Example (C#) -->") != std::string::npos) {
+ i++;
+ continue;
+ }
+ std::string token = elems[i].substr(3);
+ if (!token.empty())
+ returnParts.push_back(token);
+ i++;
+ }
+ continue;
+ }
+ else if (elems[i].find("\\deprecated") != std::string::npos) {
+ i++;
+ isDeprecated = true;
+ continue;
+ }
+ else if (elems[i].find("\\exception") != std::string::npos) {
+ std::string except = elems[i].substr(elems[i].find("\\exception") + 10);
+ exceptionParts.push_back(except);
+ i++;
+ continue;
+ }
+ i++;
+ }
+
+ // ---------------------- csharpDoc START ------------------------ //
+ std::string csharpDoc = "\n///<summary>\n";
+
+ if (descriptionParts.size() > 0) {
+ for (int i = 0; i < descriptionParts.size(); i++) {
+ csharpDoc.append("///");
+ csharpDoc.append(linkifyCSharpDocFragment(descriptionParts[i]));
+ csharpDoc.append("\n");
+ }
+ csharpDoc.append("///</summary>\n");
+ } else {
+ csharpDoc.append("///TODO: API Documentation is missing or failed to translate doxygen brief directive (message inserted by IMake.exe)\n///</summary>\n");
+ }
+
+ if (paramParts.size() > 0) {
+ for (int i = 0; i < paramParts.size(); i++) {
+ std::vector<std::string> pelems;
+ std::stringstream pss(linkifyCSharpDocFragment(paramParts[i]));
+ std::string pitem;
+ while(std::getline(pss, pitem, ' ')) {
+ if (!pitem.empty())
+ pelems.push_back(pitem);
+ }
+
+ if (pelems.size() > 1) { //Should be
+ csharpDoc.append("///<param name=\"");
+ csharpDoc.append(pelems[0]);
+ csharpDoc.append("\">");
+ csharpDoc.append("\n///");
+ for (int i = 1; i < pelems.size(); i++) {
+ csharpDoc.append(" ");
+ csharpDoc.append(pelems[i]);
+ }
+ csharpDoc.append("\n///</param>\n");
+ }
+ }
+ }
+
+ if (returnParts.size() > 0) {
+ csharpDoc.append("///<returns>");
+ for (int i = 0; i < returnParts.size(); i++) {
+ csharpDoc.append(linkifyCSharpDocFragment(returnParts[i]));
+ if (i < returnParts.size() - 1)
+ csharpDoc.append("\n/// ");
+ }
+ csharpDoc.append("\n///</returns>\n");
+ }
+
+ if (exceptionParts.size() > 0) {
+ for (int i = 0; i < exceptionParts.size(); i++) {
+
+ std::vector<std::string> eelems;
+ std::stringstream ess(exceptionParts[i]);
+ std::string eitem;
+ while(std::getline(ess, eitem, ' ')) {
+ if (!eitem.empty())
+ eelems.push_back(eitem);
+ }
+
+ csharpDoc.append("///<exception cref=\"");
+ csharpDoc.append(nspace);
+ csharpDoc.append(".");
+ if (eelems.size() > 1) {
+ csharpDoc.append(eelems[0]);
+ csharpDoc.append("\">");
+ for (int j = 1; j < eelems.size(); j++) {
+ csharpDoc.append(" ");
+ csharpDoc.append(eelems[j]);
+ }
+ csharpDoc.append("</exception>\n");
+ } else {
+ csharpDoc.append(eelems[0]);
+ csharpDoc.append("\"></exception>\n");
+ }
+ }
+ }
+
+ // ---------------------- csharpDoc END ------------------------ //
+ csharpDoc.append("///\n");
+ if (isDeprecated)
+ csharpDoc.append("[Obsolete(\"This method is deprecated\")]\n");
+ return csharpDoc;
+}
+
+void outputClassDoc(const string& className, const string& commentStr)
+{
+ //Nothing for PHP
+ if (language == php)
+ return;
+
+ string convertedDoc;
+ if (language == java) {
+ convertedDoc = doxygenToJavaDoc(commentStr);
+ fprintf(docOutFile, "\n%%typemap(javaclassmodifiers) %s %%{%s public%%}\n", className.c_str(), convertedDoc.c_str());
+ } else if(language == csharp) {
+ convertedDoc = doxygenToCsharpDoc(commentStr);
+ fprintf(docOutFile, "\n%%typemap(csclassmodifiers) %s %%{%s public%%}\n", className.c_str(), convertedDoc.c_str());
+ }
+}
+
+void outputMethodDoc(const string& className, const string& methodDecl, const string& commentStr)
+{
+ //Nothing for PHP
+ if (language == php)
+ return;
+
+ //Skip destructors
+ if (methodDecl.find("~") != string::npos)
+ return;
+
+ string convertedDoc;
+ string swigMethodDecl;
+ swigMethodDecl = className;
+ swigMethodDecl += "::";
+
+ //Re-tokenize the method declaration
+ //
+ //We want the bits between '(' and ')' (parentheses included) and the first token before the '('
+ std::vector<std::string> elems;
+ std::stringstream ss(methodDecl);
+ std::string item;
+ while(std::getline(ss, item, ' ')) {
+ elems.push_back(item);
+ }
+ std::string methodName;
+ for (int i = 0; i < elems.size(); i++) {
+ if (elems[i] == "" || elems[i] == "virtual")
+ continue;
+
+ if (elems[i] == "(") {
+ if (i > 0) //Should be
+ methodName += elems[i-1];
+ methodName += elems[i];
+ int j = i;
+ //Process parameters between the ( and )
+ while(j < elems.size()) {
+ j++;
+ if (elems[j] != ")") {
+ methodName += " ";
+ methodName += elems[j];
+ } else {
+ methodName += " ";
+ methodName += elems[j];
+ break;
+ }
+ }
+ break;
+ }
+ }
+
+ if (methodName.empty())
+ return;
+
+ swigMethodDecl += methodName;
+
+ if (language == java) {
+ convertedDoc = doxygenToJavaDoc(commentStr);
+ fprintf(docOutFile, "\n%%javamethodmodifiers %s %%{%s public%%}\n", swigMethodDecl.c_str(), convertedDoc.c_str());
+ } else if(language == csharp) {
+ convertedDoc = doxygenToCsharpDoc(commentStr);
+ fprintf(docOutFile, "\n%%csmethodmodifiers %s %%{%s public%%}\n", swigMethodDecl.c_str(), convertedDoc.c_str());
+ }
+}
+
void processExternalApiSection(string& className, vector<string>& tokens, int begin, int end)
{
//until we find a problem with that, we output whatever we find in this section. In the
@@ -524,6 +1133,41 @@
FILE* propertyFile = NULL;
+ string commentStr;
+ string methodDecl;
+
+ //NOTE: This can get called multiple times for a given class with various offsets, so use a std::set to guard
+ //against duplicate class documentation entries
+ if (!translateMode && classesWithDocs.find(className) == classesWithDocs.end() && begin > 0) {
+
+ int slashesCount = 0;
+ for (int i = 0; i < begin; i++) {
+ string token = tokens[i];
+ if(token == "")
+ continue;
+ //pickup the doc comments for the class, if any.
+ //all contiguous doc comment will be considered part of the class comment
+ if(strncmp(token.c_str(), "///", 3) == 0)
+ {
+ if (isAllSlashes(token))
+ {
+ slashesCount++;
+ }
+
+ if (slashesCount > 1) //Stop here, as this is generally the start of the documentation for the first method in the class
+ break;
+
+ commentStr.append(token);
+ commentStr.append("\n");
+ continue;
+ }
+ }
+ if (!commentStr.empty()) {
+ outputClassDoc(className, commentStr);
+ commentStr.clear();
+ classesWithDocs.insert(className);
+ }
+ }
for(int i = begin; i <= end; i++)
{
assignmentAdded = false;
@@ -532,6 +1176,15 @@
if(token == "")
continue;
+ //pickup the doc comments for the class, if any.
+ //all contiguous doc comment will be considered part of the class comment
+ if(strncmp(token.c_str(), "///", 3) == 0)
+ {
+ commentStr.append(token);
+ commentStr.append("\n");
+ continue;
+ }
+
if(token[0] == '_' || isalpha(token[0]))
{
if(typeReplacements.find(token) != typeReplacements.end())
@@ -545,6 +1198,22 @@
firstToken = true;
continue;
}
+ if (firstToken)
+ {
+ if (translateMode && !commentStr.empty())
+ {
+ string convertedDoc;
+ if (language == java) {
+ convertedDoc = doxygenToJavaDoc(commentStr);
+ fprintf(outfile, "%s\n ", convertedDoc.c_str());
+ } else if (language == csharp) {
+ convertedDoc = doxygenToCsharpDoc(commentStr);
+ fprintf(outfile, "%s\n ", convertedDoc.c_str());
+ }
+ commentStr.clear();
+ }
+ }
+
if(firstToken && (language == java || language == csharp))
{
fprintf(outfile, "public ");
@@ -692,8 +1361,15 @@
destructor = true;
}
+ methodDecl.append(" ");
+ methodDecl.append(token);
if(token[0] == ';' || assignmentAdded)
{
+ if (!translateMode) {
+ outputMethodDoc(className, methodDecl, commentStr);
+ }
+ commentStr.clear();
+ methodDecl.clear();
if(nesting == 0)
{
fprintf(outfile, "\n ");
@@ -764,7 +1440,7 @@
//in translation mode, filters out clases which don't belong to the class list
bool ignore = translateMode && classes.find(className) == classes.end();
-
+ //printf("Processing header: %s\n", className.c_str());
if(!ignore)
{
if(translateMode)
@@ -784,8 +1460,9 @@
fprintf(outfile, "package %s;\n\n", package.c_str());
}
- //in translate mode, pickup the doc comments for the class, if any.
+ //pickup the doc comments for the class, if any.
//all contiguous doc comment will be considered part of the class comment
+ string commentStr;
int commentStart = i - 2;
for(; commentStart >= 0; )
{
@@ -799,10 +1476,22 @@
for(commentStart = commentStart < 0? commentStart+1: commentStart; commentStart <= i - 2; commentStart++)
{
const char* thisTok = tokens[commentStart].c_str();
- fprintf(outfile, "%s\n", tokens[commentStart].c_str());
+ commentStr.append(thisTok);
+ commentStr.append("\n");
}
}
+ if (!commentStr.empty())
+ {
+ string convertedDoc;
+ if (language == java) {
+ convertedDoc = doxygenToJavaDoc(commentStr);
+ fprintf(outfile, "%s", convertedDoc.c_str());
+ } else if (language == csharp) {
+ convertedDoc = doxygenToCsharpDoc(commentStr);
+ fprintf(outfile, "%s", convertedDoc.c_str());
+ }
+ }
}
//output the class header
@@ -865,11 +1554,12 @@
if(!ignore)
{
fprintf(outfile, "\n}");
- if(!translateMode)
+ if(!translateMode) {
fprintf(outfile, ";\n\n");
- else
+ }
+ else {
fprintf(outfile, "\n\n");
-
+ }
}
}
@@ -895,7 +1585,10 @@
{
outfile = fopen(target.c_str(), "w");
if(outfile == NULL)
- error(string("Cannot create file ") + target);
+ error(string("Cannot create target file ") + target);
+ docOutFile = fopen(docTarget.c_str(), "w");
+ if(docOutFile == NULL)
+ error(string("Cannot create doctarget file ") + docTarget);
}
time_t now = time(NULL);
@@ -909,6 +1602,15 @@
//write the module
fprintf(outfile, "%%module %s\n", module.c_str());
+ if(!translateMode)
+ {
+ //write the banner
+ fprintf(docOutFile, "//======================================================\n");
+ fprintf(docOutFile, "// Generated with IMake version %s\n", version);
+ fprintf(docOutFile, "// %s\n", asctime(localtime(&now)));
+ fprintf(docOutFile, "//\n");
+ }
+
if(!translateMode || language != java)
{
//write the C++ inline code
@@ -926,7 +1628,12 @@
processHeaderFile(*it);
if(!translateMode || language != java)
+ {
fclose(outfile);
+ if (docOutFile != NULL) {
+ fclose(docOutFile);
+ }
+ }
}
void createNativeFile()
@@ -934,6 +1641,9 @@
if(target.length() == 0)
error("Target section is missing");
+ if (!translateMode && docTarget.length() == 0)
+ error("DocTarget section is missing");
+
if(language == unknown)
error("Unknown language");
@@ -942,6 +1652,11 @@
outfile = fopen(target.c_str(), "w");
if(outfile == NULL)
error(string("Cannot create file ") + target);
+ if (!translateMode) {
+ docOutFile = fopen(docTarget.c_str(), "w");
+ if (docOutFile == NULL)
+ error(string("Cannot create file ") + docTarget);
+ }
}
if(language == php)
@@ -978,6 +1693,8 @@
if(language != java)
fclose(outfile);
+ if (docOutFile != NULL)
+ fclose(docOutFile);
}
void createInterfaceFile(char* paramFile)
Modified: trunk/MgDev/BuildTools/WebTools/IMake/Win32/IMake.exe
===================================================================
(Binary files differ)
Modified: trunk/MgDev/BuildTools/WebTools/IMake/stdafx.h
===================================================================
--- trunk/MgDev/BuildTools/WebTools/IMake/stdafx.h 2013-01-09 19:09:42 UTC (rev 7296)
+++ trunk/MgDev/BuildTools/WebTools/IMake/stdafx.h 2013-01-12 03:36:03 UTC (rev 7297)
@@ -7,10 +7,12 @@
#define _IMAKE_STD_H_
#include <string>
+#include <iostream>
#include <vector>
#include <algorithm>
#include <deque>
#include <map>
+#include <set>
#include <iostream>
#include <sstream>
#include <time.h>
Modified: trunk/MgDev/Common/Foundation/Data/PropertyDefinition.h
===================================================================
--- trunk/MgDev/Common/Foundation/Data/PropertyDefinition.h 2013-01-09 19:09:42 UTC (rev 7296)
+++ trunk/MgDev/Common/Foundation/Data/PropertyDefinition.h 2013-01-12 03:36:03 UTC (rev 7297)
@@ -201,6 +201,7 @@
/// Returns nothing.
///
/// \since 2.2
+ ///
void Delete();
EXTERNAL_API:
Modified: trunk/MgDev/Common/MapGuideCommon/Services/MappingService.h
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/Services/MappingService.h 2013-01-09 19:09:42 UTC (rev 7296)
+++ trunk/MgDev/Common/MapGuideCommon/Services/MappingService.h 2013-01-12 03:36:03 UTC (rev 7297)
@@ -337,7 +337,7 @@
/// The requested image height in pixels.
/// \param format (String/string)
/// Input
- /// Image format, from MgImageFormats. Example: PNG, JPG, PNG8, etc …
+ /// Image format, from MgImageFormats. Example: PNG, JPG, PNG8, etc
/// \param geomType (int)
/// Input
/// The type of symbolization required: 1=Point, 2=Line, 3=Area, 4=Composite
@@ -400,7 +400,7 @@
/// \return
/// A byte reader containing an XML document with the feature
/// information described in GML (Geography Markup Language). GML
- /// is defined by the OpenGIS® consortium. A specification for
+ /// is defined by the OpenGIS consortium. A specification for
/// this language can be found at: /// https://portal.opengeospatial.org/files/?artifact_id=7174
///
///
@@ -439,7 +439,7 @@
/// \return
/// Returns a byte reader containing an XML document with the feature
/// information described in GML (Geography Markup Language). GML
- /// is defined by the OpenGIS® consortium. A specification for
+ /// is defined by the OpenGIS consortium. A specification for
/// this language can be found at: /// https://portal.opengeospatial.org/files/?artifact_id=7174
///
///
Modified: trunk/MgDev/Common/PlatformBase/Services/ClassDefinition.h
===================================================================
--- trunk/MgDev/Common/PlatformBase/Services/ClassDefinition.h 2013-01-09 19:09:42 UTC (rev 7296)
+++ trunk/MgDev/Common/PlatformBase/Services/ClassDefinition.h 2013-01-12 03:36:03 UTC (rev 7297)
@@ -318,6 +318,7 @@
/// Returns nothing.
///
/// \since 2.2
+ ///
void Delete();
EXTERNAL_API:
Modified: trunk/MgDev/Common/PlatformBase/Services/FeatureSchema.h
===================================================================
--- trunk/MgDev/Common/PlatformBase/Services/FeatureSchema.h 2013-01-09 19:09:42 UTC (rev 7296)
+++ trunk/MgDev/Common/PlatformBase/Services/FeatureSchema.h 2013-01-12 03:36:03 UTC (rev 7297)
@@ -200,6 +200,7 @@
/// Returns nothing.
///
/// \since 2.2
+ ///
void Delete();
INTERNAL_API:
Modified: trunk/MgDev/Oem/SQLite/src/SQLitePhpApi/SQliteApiGen.xml
===================================================================
--- trunk/MgDev/Oem/SQLite/src/SQLitePhpApi/SQliteApiGen.xml 2013-01-09 19:09:42 UTC (rev 7296)
+++ trunk/MgDev/Oem/SQLite/src/SQLitePhpApi/SQliteApiGen.xml 2013-01-12 03:36:03 UTC (rev 7297)
@@ -9,6 +9,7 @@
Target section.
-->
<Target path="./SQLitePhpApi.i"/>
+<DocTarget path="./SQLitePhpApi_Doc.i"/>
<!--
C++ inline section.
Modified: trunk/MgDev/Oem/SWIGEx/Source/Modules/java.cxx
===================================================================
--- trunk/MgDev/Oem/SWIGEx/Source/Modules/java.cxx 2013-01-09 19:09:42 UTC (rev 7296)
+++ trunk/MgDev/Oem/SWIGEx/Source/Modules/java.cxx 2013-01-12 03:36:03 UTC (rev 7297)
@@ -62,6 +62,8 @@
bool wrapping_member_flag; // Flag for when wrapping a member variable/enum/const
bool global_variable_flag; // Flag for when wrapping a global variable
bool member_func_flag; // flag set when wrapping a member function
+ bool lower_camel_case_method_names; //Flag to determine if java method should be forced into lowerCamelCase
+ bool skip_throws_clause; //Flag to determine if throws clauses are to be omitted (assumes root exception proxy extends RuntimeException)
bool firstFuncWrapper;
@@ -136,6 +138,8 @@
global_variable_flag(false),
member_func_flag(false),
firstFuncWrapper(true),
+ lower_camel_case_method_names(false),
+ skip_throws_clause(false),
imclass_name(NULL),
module_class_name(NULL),
@@ -332,6 +336,12 @@
} else if ((strcmp(argv[i],"-noproxy") == 0)) {
Swig_mark_arg(i);
proxy_flag = false;
+ } else if ((strcmp(argv[i],"-mgjavacasing") == 0)) {
+ Swig_mark_arg(i);
+ lower_camel_case_method_names = true;
+ } else if ((strcmp(argv[i],"-mgjavanothrow") == 0)) {
+ Swig_mark_arg(i);
+ skip_throws_clause = true;
} else if ((strcmp(argv[i],"-dllname") == 0)) {
if (argv[i+1])
{
@@ -1885,6 +1895,7 @@
String *imcall = NewString("");
String *return_type = NewString("");
String *function_code = NewString("");
+ String *camelCasedName = NULL;
if(!proxy_flag) return;
@@ -1915,12 +1926,31 @@
}
/* Start generating the proxy function */
+
+ //NOTE: Not for general consumption. All MapGuide API methods are in UpperCamelCase so this simply lowercases the first letter
+ if (lower_camel_case_method_names)
+ {
+ camelCasedName = NewString("");
+ char * chOriginalName = Char(proxy_function_name);
+ if (chOriginalName && strlen(chOriginalName) > 0)
+ {
+ int i = 0;
+ Printf(camelCasedName, "%c", tolower(chOriginalName[i]));
+ i++;
+ while(chOriginalName[i] != '\0')
+ {
+ Printf(camelCasedName, "%c", chOriginalName[i]);
+ i++;
+ }
+ }
+ }
+
const String *methodmods = Getattr(n,"feature:java:methodmodifiers");
methodmods = methodmods ? methodmods : (is_protected(n) ? protected_string : public_string);
Printf(function_code, " %s ", methodmods);
if (static_flag)
Printf(function_code, "static ");
- Printf(function_code, "%s %s(", return_type, proxy_function_name);
+ Printf(function_code, "%s %s(", return_type, (camelCasedName != NULL ? camelCasedName : proxy_function_name));
Printv(imcall, imclass_name, ".", intermediary_function_name, "(", NIL);
if (!static_flag)
@@ -1992,7 +2022,7 @@
Printf(imcall, ")");
Printf(function_code, ")");
- if(baseException)
+ if(baseException && !skip_throws_clause)
Printf(function_code, " throws %s ", baseException);
// Transform return type used in JNI function (in intermediary class) to type used in Java wrapper function (in proxy class)
@@ -2022,6 +2052,11 @@
Printv(proxy_class_code, function_code, NIL);
+ if (camelCasedName != NULL) {
+ Delete(camelCasedName);
+ camelCasedName = NULL;
+ }
+
Delete(function_code);
Delete(return_type);
Delete(imcall);
@@ -2121,7 +2156,7 @@
Printf(proxy_class_code, ")");
- if(baseException)
+ if(baseException && !skip_throws_clause)
Printf(proxy_class_code, " throws %s", baseException);
generateThrowsClause(n, proxy_class_code);
@@ -3604,6 +3639,8 @@
-package <name> - set name of the Java package to <name>\n\
-noproxy - Generate the low-level functional interface instead\n\
of proxy classes\n\
+ -mgjavanothrow - Omit the throws clause in Java wrapper methods (root proxy exception class must extend RuntimeException)\n\
+ -mgjavacasing - Force java methods to be written in lowerCamelCase\n\
-root <name> - set the name of the root class\n\
-dllname <name> - set the name of JNI dll\n\
\n";
Modified: trunk/MgDev/Oem/SWIGEx/Source/Modules/main.cxx
===================================================================
--- trunk/MgDev/Oem/SWIGEx/Source/Modules/main.cxx 2013-01-09 19:09:42 UTC (rev 7296)
+++ trunk/MgDev/Oem/SWIGEx/Source/Modules/main.cxx 2013-01-12 03:36:03 UTC (rev 7297)
@@ -71,11 +71,11 @@
static char *usage = (char*)"\
\nGeneral Options\n\
- -baseexception <name> - Name of the exception base class\n\
+ -baseexception <name> - Name of the exception base class\n\
-c++ - Enable C++ processing\n\
- -clsiddata <member> - Data member used as class identifier\n\
- -clsidcode <file> - Name of the file implementing getClassId()\n\
- -catchallcode <file> - Name of the file implementing onCatchAll()\n\
+ -clsiddata <member> - Data member used as class identifier\n\
+ -clsidcode <file> - Name of the file implementing getClassId()\n\
+ -catchallcode <file> - Name of the file implementing onCatchAll()\n\
-co - Check a file out of the SWIG library\n\
-dispose <code> - Code to call to replace 'delete arg1'\n\
-dirprot - Turn on wrapping of protected members for director classes\n\
Modified: trunk/MgDev/Oem/SWIGEx/Win32/Swig.exe
===================================================================
(Binary files differ)
Property changes on: trunk/MgDev/UnitTest/Common/JavaApiExTest
___________________________________________________________________
Added: svn:ignore
+ out
Added: bugtraq:number
+ true
Property changes on: trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea
___________________________________________________________________
Added: bugtraq:number
+ true
Deleted: trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/.name
===================================================================
--- sandbox/jng/swig-java/UnitTest/Common/JavaApiExTest/.idea/.name 2012-12-08 14:59:43 UTC (rev 7251)
+++ trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/.name 2013-01-12 03:36:03 UTC (rev 7297)
@@ -1 +0,0 @@
-MapGuideApiExTest
\ No newline at end of file
Copied: trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/.name (from rev 7251, sandbox/jng/swig-java/UnitTest/Common/JavaApiExTest/.idea/.name)
===================================================================
--- trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/.name (rev 0)
+++ trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/.name 2013-01-12 03:36:03 UTC (rev 7297)
@@ -0,0 +1 @@
+MapGuideApiExTest
\ No newline at end of file
Deleted: trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/ant.xml
===================================================================
--- sandbox/jng/swig-java/UnitTest/Common/JavaApiExTest/.idea/ant.xml 2012-12-08 14:59:43 UTC (rev 7251)
+++ trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/ant.xml 2013-01-12 03:36:03 UTC (rev 7297)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="AntConfiguration">
- <defaultAnt bundledAnt="true" />
- </component>
-</project>
-
Copied: trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/ant.xml (from rev 7251, sandbox/jng/swig-java/UnitTest/Common/JavaApiExTest/.idea/ant.xml)
===================================================================
--- trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/ant.xml (rev 0)
+++ trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/ant.xml 2013-01-12 03:36:03 UTC (rev 7297)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="AntConfiguration">
+ <defaultAnt bundledAnt="true" />
+ </component>
+</project>
+
Deleted: trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/compiler.xml
===================================================================
--- sandbox/jng/swig-java/UnitTest/Common/JavaApiExTest/.idea/compiler.xml 2012-12-08 14:59:43 UTC (rev 7251)
+++ trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/compiler.xml 2013-01-12 03:36:03 UTC (rev 7297)
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="CompilerConfiguration">
- <option name="DEFAULT_COMPILER" value="Javac" />
- <resourceExtensions />
- <wildcardResourcePatterns>
- <entry name="?*.properties" />
- <entry name="?*.xml" />
- <entry name="?*.gif" />
- <entry name="?*.png" />
- <entry name="?*.jpeg" />
- <entry name="?*.jpg" />
- <entry name="?*.html" />
- <entry name="?*.dtd" />
- <entry name="?*.tld" />
- <entry name="?*.ftl" />
- </wildcardResourcePatterns>
- <annotationProcessing enabled="false" useClasspath="true" />
- </component>
-</project>
-
Copied: trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/compiler.xml (from rev 7251, sandbox/jng/swig-java/UnitTest/Common/JavaApiExTest/.idea/compiler.xml)
===================================================================
--- trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/compiler.xml (rev 0)
+++ trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/compiler.xml 2013-01-12 03:36:03 UTC (rev 7297)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="CompilerConfiguration">
+ <option name="DEFAULT_COMPILER" value="Javac" />
+ <resourceExtensions />
+ <wildcardResourcePatterns>
+ <entry name="?*.properties" />
+ <entry name="?*.xml" />
+ <entry name="?*.gif" />
+ <entry name="?*.png" />
+ <entry name="?*.jpeg" />
+ <entry name="?*.jpg" />
+ <entry name="?*.html" />
+ <entry name="?*.dtd" />
+ <entry name="?*.tld" />
+ <entry name="?*.ftl" />
+ </wildcardResourcePatterns>
+ <annotationProcessing enabled="false" useClasspath="true" />
+ </component>
+</project>
+
Property changes on: trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/copyright
___________________________________________________________________
Added: bugtraq:number
+ true
Deleted: trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/copyright/profiles_settings.xml
===================================================================
--- sandbox/jng/swig-java/UnitTest/Common/JavaApiExTest/.idea/copyright/profiles_settings.xml 2012-12-08 14:59:43 UTC (rev 7251)
+++ trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/copyright/profiles_settings.xml 2013-01-12 03:36:03 UTC (rev 7297)
@@ -1,5 +0,0 @@
-<component name="CopyrightManager">
- <settings default="">
- <module2copyright />
- </settings>
-</component>
\ No newline at end of file
Copied: trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/copyright/profiles_settings.xml (from rev 7251, sandbox/jng/swig-java/UnitTest/Common/JavaApiExTest/.idea/copyright/profiles_settings.xml)
===================================================================
--- trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/copyright/profiles_settings.xml (rev 0)
+++ trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/copyright/profiles_settings.xml 2013-01-12 03:36:03 UTC (rev 7297)
@@ -0,0 +1,5 @@
+<component name="CopyrightManager">
+ <settings default="">
+ <module2copyright />
+ </settings>
+</component>
\ No newline at end of file
Deleted: trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/encodings.xml
===================================================================
--- sandbox/jng/swig-java/UnitTest/Common/JavaApiExTest/.idea/encodings.xml 2012-12-08 14:59:43 UTC (rev 7251)
+++ trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/encodings.xml 2013-01-12 03:36:03 UTC (rev 7297)
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
-</project>
-
Copied: trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/encodings.xml (from rev 7251, sandbox/jng/swig-java/UnitTest/Common/JavaApiExTest/.idea/encodings.xml)
===================================================================
--- trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/encodings.xml (rev 0)
+++ trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/encodings.xml 2013-01-12 03:36:03 UTC (rev 7297)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
+</project>
+
Property changes on: trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/inspectionProfiles
___________________________________________________________________
Added: bugtraq:number
+ true
Deleted: trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/misc.xml
===================================================================
--- sandbox/jng/swig-java/UnitTest/Common/JavaApiExTest/.idea/misc.xml 2012-12-08 14:59:43 UTC (rev 7251)
+++ trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/misc.xml 2013-01-12 03:36:03 UTC (rev 7297)
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="EntryPointsManager">
- <entry_points version="2.0" />
- </component>
- <component name="ProjectResources">
- <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
- </component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">
- <output url="file://$PROJECT_DIR$/out" />
- </component>
- <component name="SvnConfiguration" maxAnnotateRevisions="500" myUseAcceleration="nothing" myAutoUpdateAfterCommit="false" cleanupOnStartRun="false">
- <option name="USER" value="" />
- <option name="PASSWORD" value="" />
- <option name="mySSHConnectionTimeout" value="30000" />
- <option name="mySSHReadTimeout" value="30000" />
- <option name="LAST_MERGED_REVISION" />
- <option name="MERGE_DRY_RUN" value="false" />
- <option name="MERGE_DIFF_USE_ANCESTRY" value="true" />
- <option name="UPDATE_LOCK_ON_DEMAND" value="false" />
- <option name="IGNORE_SPACES_IN_MERGE" value="false" />
- <option name="DETECT_NESTED_COPIES" value="true" />
- <option name="CHECK_NESTED_FOR_QUICK_MERGE" value="false" />
- <option name="IGNORE_SPACES_IN_ANNOTATE" value="true" />
- <option name="SHOW_MERGE_SOURCES_IN_ANNOTATE" value="true" />
- <option name="FORCE_UPDATE" value="false" />
- <option name="IGNORE_EXTERNALS" value="false" />
- <myIsUseDefaultProxy>false</myIsUseDefaultProxy>
- </component>
-</project>
-
Copied: trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/misc.xml (from rev 7251, sandbox/jng/swig-java/UnitTest/Common/JavaApiExTest/.idea/misc.xml)
===================================================================
--- trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/misc.xml (rev 0)
+++ trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/misc.xml 2013-01-12 03:36:03 UTC (rev 7297)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="EntryPointsManager">
+ <entry_points version="2.0" />
+ </component>
+ <component name="ProjectResources">
+ <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
+ </component>
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">
+ <output url="file://$PROJECT_DIR$/out" />
+ </component>
+ <component name="SvnConfiguration" maxAnnotateRevisions="500" myUseAcceleration="nothing" myAutoUpdateAfterCommit="false" cleanupOnStartRun="false">
+ <option name="USER" value="" />
+ <option name="PASSWORD" value="" />
+ <option name="mySSHConnectionTimeout" value="30000" />
+ <option name="mySSHReadTimeout" value="30000" />
+ <option name="LAST_MERGED_REVISION" />
+ <option name="MERGE_DRY_RUN" value="false" />
+ <option name="MERGE_DIFF_USE_ANCESTRY" value="true" />
+ <option name="UPDATE_LOCK_ON_DEMAND" value="false" />
+ <option name="IGNORE_SPACES_IN_MERGE" value="false" />
+ <option name="DETECT_NESTED_COPIES" value="true" />
+ <option name="CHECK_NESTED_FOR_QUICK_MERGE" value="false" />
+ <option name="IGNORE_SPACES_IN_ANNOTATE" value="true" />
+ <option name="SHOW_MERGE_SOURCES_IN_ANNOTATE" value="true" />
+ <option name="FORCE_UPDATE" value="false" />
+ <option name="IGNORE_EXTERNALS" value="false" />
+ <myIsUseDefaultProxy>false</myIsUseDefaultProxy>
+ </component>
+</project>
+
Deleted: trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/modules.xml
===================================================================
--- sandbox/jng/swig-java/UnitTest/Common/JavaApiExTest/.idea/modules.xml 2012-12-08 14:59:43 UTC (rev 7251)
+++ trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/modules.xml 2013-01-12 03:36:03 UTC (rev 7297)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="ProjectModuleManager">
- <modules>
- <module fileurl="file://$PROJECT_DIR$/MapGuideApiExTest.iml" filepath="$PROJECT_DIR$/MapGuideApiExTest.iml" />
- </modules>
- </component>
-</project>
-
Copied: trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/modules.xml (from rev 7251, sandbox/jng/swig-java/UnitTest/Common/JavaApiExTest/.idea/modules.xml)
===================================================================
--- trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/modules.xml (rev 0)
+++ trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/modules.xml 2013-01-12 03:36:03 UTC (rev 7297)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="ProjectModuleManager">
+ <modules>
+ <module fileurl="file://$PROJECT_DIR$/MapGuideApiExTest.iml" filepath="$PROJECT_DIR$/MapGuideApiExTest.iml" />
+ </modules>
+ </component>
+</project>
+
Property changes on: trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/scopes
___________________________________________________________________
Added: bugtraq:number
+ true
Deleted: trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/scopes/scope_settings.xml
===================================================================
--- sandbox/jng/swig-java/UnitTest/Common/JavaApiExTest/.idea/scopes/scope_settings.xml 2012-12-08 14:59:43 UTC (rev 7251)
+++ trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/scopes/scope_settings.xml 2013-01-12 03:36:03 UTC (rev 7297)
@@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
- <state>
- <option name="SKIP_IMPORT_STATEMENTS" value="false" />
- </state>
-</component>
\ No newline at end of file
Copied: trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/scopes/scope_settings.xml (from rev 7251, sandbox/jng/swig-java/UnitTest/Common/JavaApiExTest/.idea/scopes/scope_settings.xml)
===================================================================
--- trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/scopes/scope_settings.xml (rev 0)
+++ trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/scopes/scope_settings.xml 2013-01-12 03:36:03 UTC (rev 7297)
@@ -0,0 +1,5 @@
+<component name="DependencyValidationManager">
+ <state>
+ <option name="SKIP_IMPORT_STATEMENTS" value="false" />
+ </state>
+</component>
\ No newline at end of file
Deleted: trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/uiDesigner.xml
===================================================================
--- sandbox/jng/swig-java/UnitTest/Common/JavaApiExTest/.idea/uiDesigner.xml 2012-12-08 14:59:43 UTC (rev 7251)
+++ trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/uiDesigner.xml 2013-01-12 03:36:03 UTC (rev 7297)
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="Palette2">
- <group name="Swing">
- <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
- <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
- </item>
- <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
- <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
- </item>
- <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
- <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
- </item>
- <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
- <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
- </item>
- <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
- <initial-values>
- <property name="text" value="Button" />
- </initial-values>
- </item>
- <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
- <initial-values>
- <property name="text" value="RadioButton" />
- </initial-values>
- </item>
- <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
- <initial-values>
- <property name="text" value="CheckBox" />
- </initial-values>
- </item>
- <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
- <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
- <initial-values>
- <property name="text" value="Label" />
- </initial-values>
- </item>
- <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
- <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
- <preferred-size width="150" height="-1" />
- </default-constraints>
- </item>
- <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
- <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
- <preferred-size width="150" height="-1" />
- </default-constraints>
- </item>
- <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
- <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
- <preferred-size width="150" height="-1" />
- </default-constraints>
- </item>
- <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
- <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
- <preferred-size width="150" height="50" />
- </default-constraints>
- </item>
- <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
- <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
- <preferred-size width="150" height="50" />
- </default-constraints>
- </item>
- <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
- <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
- <preferred-size width="150" height="50" />
- </default-constraints>
- </item>
- <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
- <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
- </item>
- <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
- <preferred-size width="150" height="50" />
- </default-constraints>
- </item>
- <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
- <preferred-size width="150" height="50" />
- </default-constraints>
- </item>
- <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
- <preferred-size width="150" height="50" />
- </default-constraints>
- </item>
- <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
- <preferred-size width="200" height="200" />
- </default-constraints>
- </item>
- <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
- <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
- <preferred-size width="200" height="200" />
- </default-constraints>
- </item>
- <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
- <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
- </item>
- <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
- </item>
- <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
- <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
- </item>
- <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
- </item>
- <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
- <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
- <preferred-size width="-1" height="20" />
- </default-constraints>
- </item>
- <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
- <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
- </item>
- <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
- <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
- </item>
- </group>
- </component>
-</project>
-
Copied: trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/uiDesigner.xml (from rev 7251, sandbox/jng/swig-java/UnitTest/Common/JavaApiExTest/.idea/uiDesigner.xml)
===================================================================
--- trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/uiDesigner.xml (rev 0)
+++ trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/uiDesigner.xml 2013-01-12 03:36:03 UTC (rev 7297)
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="Palette2">
+ <group name="Swing">
+ <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+ </item>
+ <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+ </item>
+ <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+ </item>
+ <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+ <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+ </item>
+ <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+ <initial-values>
+ <property name="text" value="Button" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+ <initial-values>
+ <property name="text" value="RadioButton" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+ <initial-values>
+ <property name="text" value="CheckBox" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+ <initial-values>
+ <property name="text" value="Label" />
+ </initial-values>
+ </item>
+ <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+ <preferred-size width="150" height="-1" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+ <preferred-size width="150" height="-1" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+ <preferred-size width="150" height="-1" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+ </item>
+ <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+ <preferred-size width="150" height="50" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+ <preferred-size width="200" height="200" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+ <preferred-size width="200" height="200" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+ </item>
+ <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+ </item>
+ <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+ </item>
+ <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+ </item>
+ <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+ <preferred-size width="-1" height="20" />
+ </default-constraints>
+ </item>
+ <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+ <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+ </item>
+ <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+ <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+ </item>
+ </group>
+ </component>
+</project>
+
Deleted: trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/vcs.xml
===================================================================
--- sandbox/jng/swig-java/UnitTest/Common/JavaApiExTest/.idea/vcs.xml 2012-12-08 14:59:43 UTC (rev 7251)
+++ trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/vcs.xml 2013-01-12 03:36:03 UTC (rev 7297)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="VcsDirectoryMappings">
- <mapping directory="" vcs="" />
- </component>
-</project>
-
Copied: trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/vcs.xml (from rev 7251, sandbox/jng/swig-java/UnitTest/Common/JavaApiExTest/.idea/vcs.xml)
===================================================================
--- trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/vcs.xml (rev 0)
+++ trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/vcs.xml 2013-01-12 03:36:03 UTC (rev 7297)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="VcsDirectoryMappings">
+ <mapping directory="" vcs="" />
+ </component>
+</project>
+
Deleted: trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/workspace.xml
===================================================================
--- sandbox/jng/swig-java/UnitTest/Common/JavaApiExTest/.idea/workspace.xml 2012-12-08 14:59:43 UTC (rev 7251)
+++ trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/workspace.xml 2013-01-12 03:36:03 UTC (rev 7297)
@@ -1,645 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="ChangeListManager">
- <list default="true" id="f24f429b-81bb-475f-9057-46f372ac8279" name="Default" comment="" />
- <ignored path="MapGuideApiExTest.iws" />
- <ignored path=".idea/workspace.xml" />
- <option name="TRACKING_ENABLED" value="true" />
- <option name="SHOW_DIALOG" value="false" />
- <option name="HIGHLIGHT_CONFLICTS" value="true" />
- <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
- <option name="LAST_RESOLUTION" value="IGNORE" />
- </component>
- <component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
- <component name="CreatePatchCommitExecutor">
- <option name="PATCH_PATH" value="" />
- </component>
- <component name="DaemonCodeAnalyzer">
- <disable_hints />
- </component>
- <component name="DebuggerManager">
- <line_breakpoints>
- <breakpoint url="file://$PROJECT_DIR$/src/MapGuideApiTest.java" line="1026" class="MapGuideApiTest" package="">
- <option name="ENABLED" value="true" />
- <option name="LOG_ENABLED" value="false" />
- <option name="LOG_EXPRESSION_ENABLED" value="false" />
- <option name="SUSPEND_POLICY" value="SuspendAll" />
- <option name="COUNT_FILTER_ENABLED" value="false" />
- <option name="COUNT_FILTER" value="0" />
- <option name="CONDITION_ENABLED" value="false" />
- <option name="CLASS_FILTERS_ENABLED" value="false" />
- <option name="INSTANCE_FILTERS_ENABLED" value="false" />
- <option name="CONDITION" value="" />
- <option name="LOG_MESSAGE" value="" />
- </breakpoint>
- </line_breakpoints>
- <breakpoint_any>
- <breakpoint>
- <option name="NOTIFY_CAUGHT" value="true" />
- <option name="NOTIFY_UNCAUGHT" value="true" />
- <option name="ENABLED" value="false" />
- <option name="LOG_ENABLED" value="false" />
- <option name="LOG_EXPRESSION_ENABLED" value="false" />
- <option name="SUSPEND_POLICY" value="SuspendAll" />
- <option name="COUNT_FILTER_ENABLED" value="false" />
- <option name="COUNT_FILTER" value="0" />
- <option name="CONDITION_ENABLED" value="false" />
- <option name="CLASS_FILTERS_ENABLED" value="false" />
- <option name="INSTANCE_FILTERS_ENABLED" value="false" />
- <option name="CONDITION" value="" />
- <option name="LOG_MESSAGE" value="" />
- </breakpoint>
- <breakpoint>
- <option name="NOTIFY_CAUGHT" value="true" />
- <option name="NOTIFY_UNCAUGHT" value="true" />
- <option name="ENABLED" value="false" />
- <option name="LOG_ENABLED" value="false" />
- <option name="LOG_EXPRESSION_ENABLED" value="false" />
- <option name="SUSPEND_POLICY" value="SuspendAll" />
- <option name="COUNT_FILTER_ENABLED" value="false" />
- <option name="COUNT_FILTER" value="0" />
- <option name="CONDITION_ENABLED" value="false" />
- <option name="CLASS_FILTERS_ENABLED" value="false" />
- <option name="INSTANCE_FILTERS_ENABLED" value="false" />
- <option name="CONDITION" value="" />
- <option name="LOG_MESSAGE" value="" />
- </breakpoint>
- </breakpoint_any>
- <breakpoint_rules />
- <ui_properties />
- </component>
- <component name="FavoritesManager">
- <favorites_list name="MapGuideApiExTest" />
- </component>
- <component name="FileEditorManager">
- <leaf>
- <file leaf-file-name="MapGuideApiTest.java" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/src/MapGuideApiTest.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="1227" column="57" selection-start="58790" selection-end="58790" vertical-scroll-proportion="0.9583333">
- <folding>
- <element signature="method#testReadOnlyLayerCollection#0;class#MapGuideApiTest#0" expanded="false" />
- <element signature="method#testStringCollection#0;class#MapGuideApiTest#0" expanded="false" />
- <element signature="method#testPropertyCollection#0;class#MapGuideApiTest#0" expanded="false" />
- <element signature="method#testClassDefinitionCollection#0;class#MapGuideApiTest#0" expanded="false" />
- <element signature="e#54940#54954#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- </leaf>
- </component>
- <component name="FindManager">
- <FindUsagesManager>
- <setting name="OPEN_NEW_TAB" value="false" />
- </FindUsagesManager>
- </component>
- <component name="IdeDocumentHistory">
- <option name="changedFiles">
- <list>
- <option value="$PROJECT_DIR$/src/AssertException.java" />
- <option value="$PROJECT_DIR$/../../../Web/src/WEB-INF/lib/MapGuideApiEx-sources.jar!/org/osgeo/mapguide/MgFeatureSchemaCollection.java" />
- <option value="$PROJECT_DIR$/../../../Web/src/WEB-INF/lib/MapGuideApiEx-sources.jar!/org/osgeo/mapguide/MgPropertyDefinitionCollection.java" />
- <option value="$PROJECT_DIR$/src/MapGuideApiTest.java" />
- </list>
- </option>
- </component>
- <component name="ProjectFrameBounds">
- <option name="x" value="1721" />
- <option name="y" value="53" />
- <option name="width" value="1218" />
- <option name="height" value="928" />
- </component>
- <component name="ProjectLevelVcsManager" settingsEditedManually="false">
- <OptionsSetting value="true" id="Add" />
- <OptionsSetting value="true" id="Remove" />
- <OptionsSetting value="true" id="Checkout" />
- <OptionsSetting value="true" id="Update" />
- <OptionsSetting value="true" id="Status" />
- <OptionsSetting value="true" id="Edit" />
- <ConfirmationsSetting value="0" id="Add" />
- <ConfirmationsSetting value="0" id="Remove" />
- </component>
- <component name="ProjectReloadState">
- <option name="STATE" value="0" />
- </component>
- <component name="ProjectView">
- <navigator currentView="ProjectPane" proportions="" version="1" splitterProportion="0.5">
- <flattenPackages />
- <showMembers />
- <showModules />
- <showLibraryContents />
- <hideEmptyPackages />
- <abbreviatePackageNames />
- <autoscrollToSource />
- <autoscrollFromSource />
- <sortByType />
- </navigator>
- <panes>
- <pane id="Scope">
- <subPane subId="Project Files">
- <PATH>
- <PATH_ELEMENT USER_OBJECT="Root">
- <option name="myItemId" value="" />
- <option name="myItemType" value="" />
- </PATH_ELEMENT>
- </PATH>
- </subPane>
- </pane>
- <pane id="PackagesPane">
- <subPane>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="MapGuideApiExTest" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="MapGuideApiExTest" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
- </PATH_ELEMENT>
- </PATH>
- </subPane>
- </pane>
- <pane id="ProjectPane">
- <subPane>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="MapGuideApiExTest" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="External Libraries" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="MapGuideApiExTest" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="External Libraries" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="MapGuideApiEx.jar" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="mapguide" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="MapGuideApiExTest" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="External Libraries" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="MapGuideApiEx.jar" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="MapGuideApiExTest" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- </PATH>
- </subPane>
- </pane>
- </panes>
- </component>
- <component name="PropertiesComponent">
- <property name="GoToFile.includeJavaFiles" value="false" />
- <property name="project.structure.last.edited" value="Modules" />
- <property name="project.structure.proportion" value="0.15" />
- <property name="options.splitter.main.proportions" value="0.3" />
- <property name="MemberChooser.sorted" value="false" />
- <property name="recentsLimit" value="5" />
- <property name="options.lastSelected" value="reference.projectsettings.compiler.javacompiler" />
- <property name="project.structure.side.proportion" value="0.2" />
- <property name="MemberChooser.copyJavadoc" value="false" />
- <property name="GoToClass.toSaveIncludeLibraries" value="false" />
- <property name="MemberChooser.showClasses" value="true" />
- <property name="GoToClass.includeLibraries" value="false" />
- <property name="dynamic.classpath" value="false" />
- <property name="options.searchVisible" value="true" />
- <property name="options.splitter.details.proportions" value="0.2" />
- </component>
- <component name="RunManager" selected="Application.Console">
- <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
- <module name="" />
- <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m" />
- <option name="PROGRAM_PARAMETERS" />
- <method>
- <option name="AntTarget" enabled="false" />
- <option name="BuildArtifacts" enabled="false" />
- <option name="Make" enabled="true" />
- <option name="Maven.BeforeRunTask" enabled="false" />
- </method>
- </configuration>
- <configuration default="true" type="Remote" factoryName="Remote">
- <option name="USE_SOCKET_TRANSPORT" value="true" />
- <option name="SERVER_MODE" value="false" />
- <option name="SHMEM_ADDRESS" value="javadebug" />
- <option name="HOST" value="localhost" />
- <option name="PORT" value="5005" />
- <method>
- <option name="AntTarget" enabled="false" />
- <option name="BuildArtifacts" enabled="false" />
- <option name="Maven.BeforeRunTask" enabled="false" />
- </method>
- </configuration>
- <configuration default="true" type="Applet" factoryName="Applet">
- <module name="" />
- <option name="MAIN_CLASS_NAME" />
- <option name="HTML_FILE_NAME" />
- <option name="HTML_USED" value="false" />
- <option name="WIDTH" value="400" />
- <option name="HEIGHT" value="300" />
- <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
- <option name="VM_PARAMETERS" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <method>
- <option name="AntTarget" enabled="false" />
- <option name="BuildArtifacts" enabled="false" />
- <option name="Make" enabled="true" />
- <option name="Maven.BeforeRunTask" enabled="false" />
- </method>
- </configuration>
- <configuration default="true" type="TestNG" factoryName="TestNG">
- <module name="" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="SUITE_NAME" />
- <option name="PACKAGE_NAME" />
- <option name="MAIN_CLASS_NAME" />
- <option name="METHOD_NAME" />
- <option name="GROUP_NAME" />
- <option name="TEST_OBJECT" value="CLASS" />
- <option name="VM_PARAMETERS" value="-ea" />
- <option name="PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="OUTPUT_DIRECTORY" />
- <option name="ANNOTATION_TYPE" />
- <option name="ENV_VARIABLES" />
- <option name="PASS_PARENT_ENVS" value="true" />
- <option name="TEST_SEARCH_SCOPE">
- <value defaultName="moduleWithDependencies" />
- </option>
- <option name="USE_DEFAULT_REPORTERS" value="false" />
- <option name="PROPERTIES_FILE" />
- <envs />
- <properties />
- <listeners />
- <method>
- <option name="AntTarget" enabled="false" />
- <option name="BuildArtifacts" enabled="false" />
- <option name="Make" enabled="true" />
- <option name="Maven.BeforeRunTask" enabled="false" />
- </method>
- </configuration>
- <configuration default="true" type="Application" factoryName="Application">
- <option name="MAIN_CLASS_NAME" value="MapGuideApiTest" />
- <option name="VM_PARAMETERS" value="" />
- <option name="PROGRAM_PARAMETERS" value="" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/../../../Web/bin/release" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" value="" />
- <option name="ENABLE_SWING_INSPECTOR" value="false" />
- <option name="ENV_VARIABLES" />
- <option name="PASS_PARENT_ENVS" value="true" />
- <module name="" />
- <envs />
- <method>
- <option name="AntTarget" enabled="false" />
- <option name="BuildArtifacts" enabled="false" />
- <option name="Make" enabled="true" />
- <option name="Maven.BeforeRunTask" enabled="false" />
- </method>
- </configuration>
- <configuration default="true" type="JUnit" factoryName="JUnit">
- <module name="" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="PACKAGE_NAME" />
- <option name="MAIN_CLASS_NAME" />
- <option name="METHOD_NAME" />
- <option name="TEST_OBJECT" value="class" />
- <option name="VM_PARAMETERS" value="-ea" />
- <option name="PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="ENV_VARIABLES" />
- <option name="PASS_PARENT_ENVS" value="true" />
- <option name="TEST_SEARCH_SCOPE">
- <value defaultName="moduleWithDependencies" />
- </option>
- <envs />
- <patterns />
- <method>
- <option name="AntTarget" enabled="false" />
- <option name="BuildArtifacts" enabled="false" />
- <option name="Make" enabled="true" />
- <option name="Maven.BeforeRunTask" enabled="false" />
- </method>
- </configuration>
- <configuration default="false" name="Console" type="Application" factoryName="Application">
- <option name="MAIN_CLASS_NAME" value="MapGuideApiTest" />
- <option name="VM_PARAMETERS" value="" />
- <option name="PROGRAM_PARAMETERS" value="" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/../../../Web/bin/release" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" value="" />
- <option name="ENABLE_SWING_INSPECTOR" value="false" />
- <option name="ENV_VARIABLES" />
- <option name="PASS_PARENT_ENVS" value="true" />
- <module name="MapGuideApiExTest" />
- <envs />
- <RunnerSettings RunnerId="Debug">
- <option name="DEBUG_PORT" value="" />
- <option name="TRANSPORT" value="0" />
- <option name="LOCAL" value="true" />
- </RunnerSettings>
- <RunnerSettings RunnerId="Run" />
- <ConfigurationWrapper RunnerId="Debug" />
- <ConfigurationWrapper RunnerId="Run" />
- <method />
- </configuration>
- <list size="1">
- <item index="0" class="java.lang.String" itemvalue="Application.Console" />
- </list>
- <configuration name="<template>" type="WebApp" default="true" selected="false">
- <Host>localhost</Host>
- <Port>5050</Port>
- </configuration>
- </component>
- <component name="ShelveChangesManager" show_recycled="false" />
- <component name="TaskManager">
- <task active="true" id="Default" summary="Default task">
- <changelist id="f24f429b-81bb-475f-9057-46f372ac8279" name="Default" comment="" />
- <created>1353932158797</created>
- <updated>1353932158797</updated>
- </task>
- <servers />
- </component>
- <component name="ToolWindowManager">
- <frame x="1721" y="53" width="1218" height="928" extended-state="0" />
- <editor active="false" />
- <layout>
- <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="JetGradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
- <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3484163" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
- <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
- <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
- <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.23243712" sideWeight="0.6049223" order="1" side_tool="true" content_ui="tabs" />
- <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.23243712" sideWeight="0.059585493" order="0" side_tool="false" content_ui="combo" />
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32642487" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
- <window_info id="Documentation" active="false" anchor="right" auto_hide="true" internal_type="DOCKED" type="FLOATING" visible="false" weight="0.32928944" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" x="839" y="583" width="636" height="307" />
- <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
- <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
- <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
- <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
- </layout>
- </component>
- <component name="VcsContentAnnotationSettings">
- <option name="myLimit" value="2678400000" />
- </component>
- <component name="VcsManagerConfiguration">
- <option name="OFFER_MOVE_TO_ANOTHER_CHANGELIST_ON_PARTIAL_COMMIT" value="true" />
- <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="true" />
- <option name="CHECK_NEW_TODO" value="true" />
- <option name="myTodoPanelSettings">
- <value>
- <are-packages-shown value="false" />
- <are-modules-shown value="false" />
- <flatten-packages value="false" />
- <is-autoscroll-to-source value="false" />
- </value>
- </option>
- <option name="PERFORM_UPDATE_IN_BACKGROUND" value="true" />
- <option name="PERFORM_COMMIT_IN_BACKGROUND" value="true" />
- <option name="PERFORM_EDIT_IN_BACKGROUND" value="true" />
- <option name="PERFORM_CHECKOUT_IN_BACKGROUND" value="true" />
- <option name="PERFORM_ADD_REMOVE_IN_BACKGROUND" value="true" />
- <option name="PERFORM_ROLLBACK_IN_BACKGROUND" value="false" />
- <option name="CHECK_LOCALLY_CHANGED_CONFLICTS_IN_BACKGROUND" value="false" />
- <option name="ENABLE_BACKGROUND_PROCESSES" value="false" />
- <option name="CHANGED_ON_SERVER_INTERVAL" value="60" />
- <option name="SHOW_ONLY_CHANGED_IN_SELECTION_DIFF" value="true" />
- <option name="CHECK_COMMIT_MESSAGE_SPELLING" value="true" />
- <option name="DEFAULT_PATCH_EXTENSION" value="patch" />
- <option name="SHORT_DIFF_HORISONTALLY" value="true" />
- <option name="SHORT_DIFF_EXTRA_LINES" value="2" />
- <option name="SOFT_WRAPS_IN_SHORT_DIFF" value="true" />
- <option name="INCLUDE_TEXT_INTO_PATCH" value="false" />
- <option name="INCLUDE_TEXT_INTO_SHELF" value="false" />
- <option name="CREATE_PATCH_EXPAND_DETAILS_DEFAULT" value="true" />
- <option name="SHOW_FILE_HISTORY_DETAILS" value="true" />
- <option name="SHOW_VCS_ERROR_NOTIFICATIONS" value="true" />
- <option name="FORCE_NON_EMPTY_COMMENT" value="false" />
- <option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="false" />
- <option name="LAST_COMMIT_MESSAGE" />
- <option name="MAKE_NEW_CHANGELIST_ACTIVE" value="false" />
- <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
- <option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" />
- <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" />
- <option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" />
- <option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" />
- <option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" />
- <option name="ACTIVE_VCS_NAME" />
- <option name="UPDATE_GROUP_BY_PACKAGES" value="false" />
- <option name="UPDATE_GROUP_BY_CHANGELIST" value="false" />
- <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
- <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
- </component>
- <component name="XDebuggerManager">
- <breakpoint-manager />
- </component>
- <component name="antWorkspaceConfiguration">
- <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
- <option name="FILTER_TARGETS" value="false" />
- </component>
- <component name="editorHistoryManager">
- <entry file="jar://$PROJECT_DIR$/../../../Web/src/WEB-INF/lib/MapGuideApiEx-sources.jar!/org/osgeo/mapguide/MapGuideJavaApiExJNI.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="2904" column="0" selection-start="270715" selection-end="270715" vertical-scroll-proportion="0.0" />
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/AssertException.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="12" column="54" selection-start="284" selection-end="284" vertical-scroll-proportion="0.0" />
- </provider>
- </entry>
- <entry file="jar://$PROJECT_DIR$/../../../Web/src/WEB-INF/lib/MapGuideApiEx-sources.jar!/org/osgeo/mapguide/MgSerializable.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="22" column="67" selection-start="712" selection-end="712" vertical-scroll-proportion="0.32258064" />
- </provider>
- </entry>
- <entry file="jar://$PROJECT_DIR$/../../../Web/src/WEB-INF/lib/MapGuideApiEx-sources.jar!/org/osgeo/mapguide/MgNamedSerializable.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="16" column="50" selection-start="516" selection-end="516" vertical-scroll-proportion="0.32258064" />
- </provider>
- </entry>
- <entry file="jar://C:/Program Files (x86)/Java/jdk1.6.0_33/src.zip!/java/lang/String.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="1004" column="0" selection-start="38011" selection-end="38011" vertical-scroll-proportion="0.03307393" />
- </provider>
- </entry>
- <entry file="jar://C:/Program Files (x86)/Java/jdk1.6.0_33/src.zip!/java/lang/StringBuilder.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="429" column="0" selection-start="12939" selection-end="12939" vertical-scroll-proportion="0.032258064" />
- </provider>
- </entry>
- <entry file="jar://C:/Program Files (x86)/Java/jdk1.6.0_33/src.zip!/java/lang/ClassLoader.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="322" column="0" selection-start="11967" selection-end="11967" vertical-scroll-proportion="0.24408014" />
- </provider>
- </entry>
- <entry file="jar://C:/Program Files (x86)/Java/jdk1.6.0_33/src.zip!/java/lang/Object.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="133" column="0" selection-start="6113" selection-end="6113" vertical-scroll-proportion="0.0" />
- </provider>
- </entry>
- <entry file="jar://C:/Program Files (x86)/Java/jdk1.6.0_33/src.zip!/java/util/ArrayList.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="215" column="0" selection-start="8342" selection-end="8342" vertical-scroll-proportion="0.0" />
- </provider>
- </entry>
- <entry file="jar://$PROJECT_DIR$/../../../Web/src/WEB-INF/lib/MapGuideApiEx-sources.jar!/org/osgeo/mapguide/MgFeatureSchemaCollection.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="210" column="26" selection-start="6412" selection-end="6412" vertical-scroll-proportion="0.0" />
- </provider>
- </entry>
- <entry file="jar://$PROJECT_DIR$/../../../Web/src/WEB-INF/lib/MapGuideApiEx-sources.jar!/org/osgeo/mapguide/MgFeatureSchema.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="79" column="51" selection-start="2059" selection-end="2059" vertical-scroll-proportion="0.60830325" />
- </provider>
- </entry>
- <entry file="jar://$PROJECT_DIR$/../../../Web/src/WEB-INF/lib/MapGuideApiEx-sources.jar!/org/osgeo/mapguide/MgByteProperty.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="16" column="14" selection-start="491" selection-end="491" vertical-scroll-proportion="-0.6895943" />
- </provider>
- </entry>
- <entry file="jar://$PROJECT_DIR$/../../../Web/src/WEB-INF/lib/MapGuideApiEx-sources.jar!/org/osgeo/mapguide/MgBatchPropertyCollection.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="116" column="0" selection-start="3461" selection-end="3461" vertical-scroll-proportion="0.33212996" />
- </provider>
- </entry>
- <entry file="jar://$PROJECT_DIR$/../../../Web/src/WEB-INF/lib/MapGuideApiEx-sources.jar!/org/osgeo/mapguide/MgPropertyDefinitionCollection.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="248" column="13" selection-start="7649" selection-end="7649" vertical-scroll-proportion="0.33212996" />
- </provider>
- </entry>
- <entry file="jar://$PROJECT_DIR$/../../../Web/src/WEB-INF/lib/MapGuideApiEx-sources.jar!/org/osgeo/mapguide/MgLayerCollection.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="172" column="71" selection-start="4032" selection-end="4922" vertical-scroll-proportion="0.6502732" />
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/src/MapGuideApiTest.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="1227" column="57" selection-start="58790" selection-end="58790" vertical-scroll-proportion="0.9583333" />
- </provider>
- </entry>
- </component>
- <component name="masterDetails">
- <states>
- <state key="ArtifactsStructureConfigurable.UI">
- <settings>
- <artifact-editor />
- <splitter-proportions>
- <option name="proportions">
- <list>
- <option value="0.2" />
- </list>
- </option>
- </splitter-proportions>
- </settings>
- </state>
- <state key="FacetStructureConfigurable.UI">
- <settings>
- <last-edited>No facets are configured</last-edited>
- <splitter-proportions>
- <option name="proportions">
- <list>
- <option value="0.2" />
- </list>
- </option>
- </splitter-proportions>
- </settings>
- </state>
- <state key="GlobalLibrariesConfigurable.UI">
- <settings>
- <splitter-proportions>
- <option name="proportions">
- <list>
- <option value="0.2" />
- </list>
- </option>
- </splitter-proportions>
- </settings>
- </state>
- <state key="JdkListConfigurable.UI">
- <settings>
- <last-edited>1.6</last-edited>
- <splitter-proportions>
- <option name="proportions">
- <list>
- <option value="0.2" />
- </list>
- </option>
- </splitter-proportions>
- </settings>
- </state>
- <state key="ModuleStructureConfigurable.UI">
- <settings>
- <last-edited>MapGuideApiExTest</last-edited>
- <splitter-proportions>
- <option name="proportions">
- <list>
- <option value="0.2" />
- </list>
- </option>
- </splitter-proportions>
- </settings>
- </state>
- <state key="ProjectJDKs.UI">
- <settings>
- <splitter-proportions>
- <option name="proportions">
- <list>
- <option value="0.2" />
- </list>
- </option>
- </splitter-proportions>
- </settings>
- </state>
- <state key="ProjectLibrariesConfigurable.UI">
- <settings>
- <splitter-proportions>
- <option name="proportions">
- <list>
- <option value="0.2" />
- </list>
- </option>
- </splitter-proportions>
- </settings>
- </state>
- </states>
- </component>
-</project>
-
Copied: trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/workspace.xml (from rev 7251, sandbox/jng/swig-java/UnitTest/Common/JavaApiExTest/.idea/workspace.xml)
===================================================================
--- trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/workspace.xml (rev 0)
+++ trunk/MgDev/UnitTest/Common/JavaApiExTest/.idea/workspace.xml 2013-01-12 03:36:03 UTC (rev 7297)
@@ -0,0 +1,645 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="ChangeListManager">
+ <list default="true" id="f24f429b-81bb-475f-9057-46f372ac8279" name="Default" comment="" />
+ <ignored path="MapGuideApiExTest.iws" />
+ <ignored path=".idea/workspace.xml" />
+ <option name="TRACKING_ENABLED" value="true" />
+ <option name="SHOW_DIALOG" value="false" />
+ <option name="HIGHLIGHT_CONFLICTS" value="true" />
+ <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+ <option name="LAST_RESOLUTION" value="IGNORE" />
+ </component>
+ <component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
+ <component name="CreatePatchCommitExecutor">
+ <option name="PATCH_PATH" value="" />
+ </component>
+ <component name="DaemonCodeAnalyzer">
+ <disable_hints />
+ </component>
+ <component name="DebuggerManager">
+ <line_breakpoints>
+ <breakpoint url="file://$PROJECT_DIR$/src/MapGuideApiTest.java" line="1026" class="MapGuideApiTest" package="">
+ <option name="ENABLED" value="true" />
+ <option name="LOG_ENABLED" value="false" />
+ <option name="LOG_EXPRESSION_ENABLED" value="false" />
+ <option name="SUSPEND_POLICY" value="SuspendAll" />
+ <option name="COUNT_FILTER_ENABLED" value="false" />
+ <option name="COUNT_FILTER" value="0" />
+ <option name="CONDITION_ENABLED" value="false" />
+ <option name="CLASS_FILTERS_ENABLED" value="false" />
+ <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+ <option name="CONDITION" value="" />
+ <option name="LOG_MESSAGE" value="" />
+ </breakpoint>
+ </line_breakpoints>
+ <breakpoint_any>
+ <breakpoint>
+ <option name="NOTIFY_CAUGHT" value="true" />
+ <option name="NOTIFY_UNCAUGHT" value="true" />
+ <option name="ENABLED" value="false" />
+ <option name="LOG_ENABLED" value="false" />
+ <option name="LOG_EXPRESSION_ENABLED" value="false" />
+ <option name="SUSPEND_POLICY" value="SuspendAll" />
+ <option name="COUNT_FILTER_ENABLED" value="false" />
+ <option name="COUNT_FILTER" value="0" />
+ <option name="CONDITION_ENABLED" value="false" />
+ <option name="CLASS_FILTERS_ENABLED" value="false" />
+ <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+ <option name="CONDITION" value="" />
+ <option name="LOG_MESSAGE" value="" />
+ </breakpoint>
+ <breakpoint>
+ <option name="NOTIFY_CAUGHT" value="true" />
+ <option name="NOTIFY_UNCAUGHT" value="true" />
+ <option name="ENABLED" value="false" />
+ <option name="LOG_ENABLED" value="false" />
+ <option name="LOG_EXPRESSION_ENABLED" value="false" />
+ <option name="SUSPEND_POLICY" value="SuspendAll" />
+ <option name="COUNT_FILTER_ENABLED" value="false" />
+ <option name="COUNT_FILTER" value="0" />
+ <option name="CONDITION_ENABLED" value="false" />
+ <option name="CLASS_FILTERS_ENABLED" value="false" />
+ <option name="INSTANCE_FILTERS_ENABLED" value="false" />
+ <option name="CONDITION" value="" />
+ <option name="LOG_MESSAGE" value="" />
+ </breakpoint>
+ </breakpoint_any>
+ <breakpoint_rules />
+ <ui_properties />
+ </component>
+ <component name="FavoritesManager">
+ <favorites_list name="MapGuideApiExTest" />
+ </component>
+ <component name="FileEditorManager">
+ <leaf>
+ <file leaf-file-name="MapGuideApiTest.java" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/src/MapGuideApiTest.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="1227" column="57" selection-start="58790" selection-end="58790" vertical-scroll-proportion="0.9583333">
+ <folding>
+ <element signature="method#testReadOnlyLayerCollection#0;class#MapGuideApiTest#0" expanded="false" />
+ <element signature="method#testStringCollection#0;class#MapGuideApiTest#0" expanded="false" />
+ <element signature="method#testPropertyCollection#0;class#MapGuideApiTest#0" expanded="false" />
+ <element signature="method#testClassDefinitionCollection#0;class#MapGuideApiTest#0" expanded="false" />
+ <element signature="e#54940#54954#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ </leaf>
+ </component>
+ <component name="FindManager">
+ <FindUsagesManager>
+ <setting name="OPEN_NEW_TAB" value="false" />
+ </FindUsagesManager>
+ </component>
+ <component name="IdeDocumentHistory">
+ <option name="changedFiles">
+ <list>
+ <option value="$PROJECT_DIR$/src/AssertException.java" />
+ <option value="$PROJECT_DIR$/../../../Web/src/WEB-INF/lib/MapGuideApiEx-sources.jar!/org/osgeo/mapguide/MgFeatureSchemaCollection.java" />
+ <option value="$PROJECT_DIR$/../../../Web/src/WEB-INF/lib/MapGuideApiEx-sources.jar!/org/osgeo/mapguide/MgPropertyDefinitionCollection.java" />
+ <option value="$PROJECT_DIR$/src/MapGuideApiTest.java" />
+ </list>
+ </option>
+ </component>
+ <component name="ProjectFrameBounds">
+ <option name="x" value="1721" />
+ <option name="y" value="53" />
+ <option name="width" value="1218" />
+ <option name="height" value="928" />
+ </component>
+ <component name="ProjectLevelVcsManager" settingsEditedManually="false">
+ <OptionsSetting value="true" id="Add" />
+ <OptionsSetting value="true" id="Remove" />
+ <OptionsSetting value="true" id="Checkout" />
+ <OptionsSetting value="true" id="Update" />
+ <OptionsSetting value="true" id="Status" />
+ <OptionsSetting value="true" id="Edit" />
+ <ConfirmationsSetting value="0" id="Add" />
+ <ConfirmationsSetting value="0" id="Remove" />
+ </component>
+ <component name="ProjectReloadState">
+ <option name="STATE" value="0" />
+ </component>
+ <component name="ProjectView">
+ <navigator currentView="ProjectPane" proportions="" version="1" splitterProportion="0.5">
+ <flattenPackages />
+ <showMembers />
+ <showModules />
+ <showLibraryContents />
+ <hideEmptyPackages />
+ <abbreviatePackageNames />
+ <autoscrollToSource />
+ <autoscrollFromSource />
+ <sortByType />
+ </navigator>
+ <panes>
+ <pane id="Scope">
+ <subPane subId="Project Files">
+ <PATH>
+ <PATH_ELEMENT USER_OBJECT="Root">
+ <option name="myItemId" value="" />
+ <option name="myItemType" value="" />
+ </PATH_ELEMENT>
+ </PATH>
+ </subPane>
+ </pane>
+ <pane id="PackagesPane">
+ <subPane>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="MapGuideApiExTest" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="MapGuideApiExTest" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ </subPane>
+ </pane>
+ <pane id="ProjectPane">
+ <subPane>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="MapGuideApiExTest" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="External Libraries" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="MapGuideApiExTest" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="External Libraries" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="MapGuideApiEx.jar" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="mapguide" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="MapGuideApiExTest" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="External Libraries" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ExternalLibrariesNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="MapGuideApiEx.jar" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="MapGuideApiExTest" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ </subPane>
+ </pane>
+ </panes>
+ </component>
+ <component name="PropertiesComponent">
+ <property name="GoToFile.includeJavaFiles" value="false" />
+ <property name="project.structure.last.edited" value="Modules" />
+ <property name="project.structure.proportion" value="0.15" />
+ <property name="options.splitter.main.proportions" value="0.3" />
+ <property name="MemberChooser.sorted" value="false" />
+ <property name="recentsLimit" value="5" />
+ <property name="options.lastSelected" value="reference.projectsettings.compiler.javacompiler" />
+ <property name="project.structure.side.proportion" value="0.2" />
+ <property name="MemberChooser.copyJavadoc" value="false" />
+ <property name="GoToClass.toSaveIncludeLibraries" value="false" />
+ <property name="MemberChooser.showClasses" value="true" />
+ <property name="GoToClass.includeLibraries" value="false" />
+ <property name="dynamic.classpath" value="false" />
+ <property name="options.searchVisible" value="true" />
+ <property name="options.splitter.details.proportions" value="0.2" />
+ </component>
+ <component name="RunManager" selected="Application.Console">
+ <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+ <module name="" />
+ <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m" />
+ <option name="PROGRAM_PARAMETERS" />
+ <method>
+ <option name="AntTarget" enabled="false" />
+ <option name="BuildArtifacts" enabled="false" />
+ <option name="Make" enabled="true" />
+ <option name="Maven.BeforeRunTask" enabled="false" />
+ </method>
+ </configuration>
+ <configuration default="true" type="Remote" factoryName="Remote">
+ <option name="USE_SOCKET_TRANSPORT" value="true" />
+ <option name="SERVER_MODE" value="false" />
+ <option name="SHMEM_ADDRESS" value="javadebug" />
+ <option name="HOST" value="localhost" />
+ <option name="PORT" value="5005" />
+ <method>
+ <option name="AntTarget" enabled="false" />
+ <option name="BuildArtifacts" enabled="false" />
+ <option name="Maven.BeforeRunTask" enabled="false" />
+ </method>
+ </configuration>
+ <configuration default="true" type="Applet" factoryName="Applet">
+ <module name="" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="HTML_FILE_NAME" />
+ <option name="HTML_USED" value="false" />
+ <option name="WIDTH" value="400" />
+ <option name="HEIGHT" value="300" />
+ <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+ <option name="VM_PARAMETERS" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <method>
+ <option name="AntTarget" enabled="false" />
+ <option name="BuildArtifacts" enabled="false" />
+ <option name="Make" enabled="true" />
+ <option name="Maven.BeforeRunTask" enabled="false" />
+ </method>
+ </configuration>
+ <configuration default="true" type="TestNG" factoryName="TestNG">
+ <module name="" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="SUITE_NAME" />
+ <option name="PACKAGE_NAME" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="METHOD_NAME" />
+ <option name="GROUP_NAME" />
+ <option name="TEST_OBJECT" value="CLASS" />
+ <option name="VM_PARAMETERS" value="-ea" />
+ <option name="PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ <option name="OUTPUT_DIRECTORY" />
+ <option name="ANNOTATION_TYPE" />
+ <option name="ENV_VARIABLES" />
+ <option name="PASS_PARENT_ENVS" value="true" />
+ <option name="TEST_SEARCH_SCOPE">
+ <value defaultName="moduleWithDependencies" />
+ </option>
+ <option name="USE_DEFAULT_REPORTERS" value="false" />
+ <option name="PROPERTIES_FILE" />
+ <envs />
+ <properties />
+ <listeners />
+ <method>
+ <option name="AntTarget" enabled="false" />
+ <option name="BuildArtifacts" enabled="false" />
+ <option name="Make" enabled="true" />
+ <option name="Maven.BeforeRunTask" enabled="false" />
+ </method>
+ </configuration>
+ <configuration default="true" type="Application" factoryName="Application">
+ <option name="MAIN_CLASS_NAME" value="MapGuideApiTest" />
+ <option name="VM_PARAMETERS" value="" />
+ <option name="PROGRAM_PARAMETERS" value="" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/../../../Web/bin/release" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" value="" />
+ <option name="ENABLE_SWING_INSPECTOR" value="false" />
+ <option name="ENV_VARIABLES" />
+ <option name="PASS_PARENT_ENVS" value="true" />
+ <module name="" />
+ <envs />
+ <method>
+ <option name="AntTarget" enabled="false" />
+ <option name="BuildArtifacts" enabled="false" />
+ <option name="Make" enabled="true" />
+ <option name="Maven.BeforeRunTask" enabled="false" />
+ </method>
+ </configuration>
+ <configuration default="true" type="JUnit" factoryName="JUnit">
+ <module name="" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="PACKAGE_NAME" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="METHOD_NAME" />
+ <option name="TEST_OBJECT" value="class" />
+ <option name="VM_PARAMETERS" value="-ea" />
+ <option name="PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ <option name="ENV_VARIABLES" />
+ <option name="PASS_PARENT_ENVS" value="true" />
+ <option name="TEST_SEARCH_SCOPE">
+ <value defaultName="moduleWithDependencies" />
+ </option>
+ <envs />
+ <patterns />
+ <method>
+ <option name="AntTarget" enabled="false" />
+ <option name="BuildArtifacts" enabled="false" />
+ <option name="Make" enabled="true" />
+ <option name="Maven.BeforeRunTask" enabled="false" />
+ </method>
+ </configuration>
+ <configuration default="false" name="Console" type="Application" factoryName="Application">
+ <option name="MAIN_CLASS_NAME" value="MapGuideApiTest" />
+ <option name="VM_PARAMETERS" value="" />
+ <option name="PROGRAM_PARAMETERS" value="" />
+ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/../../../Web/bin/release" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" value="" />
+ <option name="ENABLE_SWING_INSPECTOR" value="false" />
+ <option name="ENV_VARIABLES" />
+ <option name="PASS_PARENT_ENVS" value="true" />
+ <module name="MapGuideApiExTest" />
+ <envs />
+ <RunnerSettings RunnerId="Debug">
+ <option name="DEBUG_PORT" value="" />
+ <option name="TRANSPORT" value="0" />
+ <option name="LOCAL" value="true" />
+ </RunnerSettings>
+ <RunnerSettings RunnerId="Run" />
+ <ConfigurationWrapper RunnerId="Debug" />
+ <ConfigurationWrapper RunnerId="Run" />
+ <method />
+ </configuration>
+ <list size="1">
+ <item index="0" class="java.lang.String" itemvalue="Application.Console" />
+ </list>
+ <configuration name="<template>" type="WebApp" default="true" selected="false">
+ <Host>localhost</Host>
+ <Port>5050</Port>
+ </configuration>
+ </component>
+ <component name="ShelveChangesManager" show_recycled="false" />
+ <component name="TaskManager">
+ <task active="true" id="Default" summary="Default task">
+ <changelist id="f24f429b-81bb-475f-9057-46f372ac8279" name="Default" comment="" />
+ <created>1353932158797</created>
+ <updated>1353932158797</updated>
+ </task>
+ <servers />
+ </component>
+ <component name="ToolWindowManager">
+ <frame x="1721" y="53" width="1218" height="928" extended-state="0" />
+ <editor active="false" />
+ <layout>
+ <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+ <window_info id="JetGradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+ <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+ <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+ <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3484163" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+ <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+ <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
+ <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+ <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+ <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+ <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.23243712" sideWeight="0.6049223" order="1" side_tool="true" content_ui="tabs" />
+ <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+ <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.23243712" sideWeight="0.059585493" order="0" side_tool="false" content_ui="combo" />
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32642487" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+ <window_info id="Documentation" active="false" anchor="right" auto_hide="true" internal_type="DOCKED" type="FLOATING" visible="false" weight="0.32928944" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" x="839" y="583" width="636" height="307" />
+ <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+ <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+ <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+ <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+ </layout>
+ </component>
+ <component name="VcsContentAnnotationSettings">
+ <option name="myLimit" value="2678400000" />
+ </component>
+ <component name="VcsManagerConfiguration">
+ <option name="OFFER_MOVE_TO_ANOTHER_CHANGELIST_ON_PARTIAL_COMMIT" value="true" />
+ <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="true" />
+ <option name="CHECK_NEW_TODO" value="true" />
+ <option name="myTodoPanelSettings">
+ <value>
+ <are-packages-shown value="false" />
+ <are-modules-shown value="false" />
+ <flatten-packages value="false" />
+ <is-autoscroll-to-source value="false" />
+ </value>
+ </option>
+ <option name="PERFORM_UPDATE_IN_BACKGROUND" value="true" />
+ <option name="PERFORM_COMMIT_IN_BACKGROUND" value="true" />
+ <option name="PERFORM_EDIT_IN_BACKGROUND" value="true" />
+ <option name="PERFORM_CHECKOUT_IN_BACKGROUND" value="true" />
+ <option name="PERFORM_ADD_REMOVE_IN_BACKGROUND" value="true" />
+ <option name="PERFORM_ROLLBACK_IN_BACKGROUND" value="false" />
+ <option name="CHECK_LOCALLY_CHANGED_CONFLICTS_IN_BACKGROUND" value="false" />
+ <option name="ENABLE_BACKGROUND_PROCESSES" value="false" />
+ <option name="CHANGED_ON_SERVER_INTERVAL" value="60" />
+ <option name="SHOW_ONLY_CHANGED_IN_SELECTION_DIFF" value="true" />
+ <option name="CHECK_COMMIT_MESSAGE_SPELLING" value="true" />
+ <option name="DEFAULT_PATCH_EXTENSION" value="patch" />
+ <option name="SHORT_DIFF_HORISONTALLY" value="true" />
+ <option name="SHORT_DIFF_EXTRA_LINES" value="2" />
+ <option name="SOFT_WRAPS_IN_SHORT_DIFF" value="true" />
+ <option name="INCLUDE_TEXT_INTO_PATCH" value="false" />
+ <option name="INCLUDE_TEXT_INTO_SHELF" value="false" />
+ <option name="CREATE_PATCH_EXPAND_DETAILS_DEFAULT" value="true" />
+ <option name="SHOW_FILE_HISTORY_DETAILS" value="true" />
+ <option name="SHOW_VCS_ERROR_NOTIFICATIONS" value="true" />
+ <option name="FORCE_NON_EMPTY_COMMENT" value="false" />
+ <option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="false" />
+ <option name="LAST_COMMIT_MESSAGE" />
+ <option name="MAKE_NEW_CHANGELIST_ACTIVE" value="false" />
+ <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
+ <option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" />
+ <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" />
+ <option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" />
+ <option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" />
+ <option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" />
+ <option name="ACTIVE_VCS_NAME" />
+ <option name="UPDATE_GROUP_BY_PACKAGES" value="false" />
+ <option name="UPDATE_GROUP_BY_CHANGELIST" value="false" />
+ <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
+ <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
+ </component>
+ <component name="XDebuggerManager">
+ <breakpoint-manager />
+ </component>
+ <component name="antWorkspaceConfiguration">
+ <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
+ <option name="FILTER_TARGETS" value="false" />
+ </component>
+ <component name="editorHistoryManager">
+ <entry file="jar://$PROJECT_DIR$/../../../Web/src/WEB-INF/lib/MapGuideApiEx-sources.jar!/org/osgeo/mapguide/MapGuideJavaApiExJNI.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="2904" column="0" selection-start="270715" selection-end="270715" vertical-scroll-proportion="0.0" />
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/AssertException.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="12" column="54" selection-start="284" selection-end="284" vertical-scroll-proportion="0.0" />
+ </provider>
+ </entry>
+ <entry file="jar://$PROJECT_DIR$/../../../Web/src/WEB-INF/lib/MapGuideApiEx-sources.jar!/org/osgeo/mapguide/MgSerializable.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="22" column="67" selection-start="712" selection-end="712" vertical-scroll-proportion="0.32258064" />
+ </provider>
+ </entry>
+ <entry file="jar://$PROJECT_DIR$/../../../Web/src/WEB-INF/lib/MapGuideApiEx-sources.jar!/org/osgeo/mapguide/MgNamedSerializable.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="16" column="50" selection-start="516" selection-end="516" vertical-scroll-proportion="0.32258064" />
+ </provider>
+ </entry>
+ <entry file="jar://C:/Program Files (x86)/Java/jdk1.6.0_33/src.zip!/java/lang/String.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="1004" column="0" selection-start="38011" selection-end="38011" vertical-scroll-proportion="0.03307393" />
+ </provider>
+ </entry>
+ <entry file="jar://C:/Program Files (x86)/Java/jdk1.6.0_33/src.zip!/java/lang/StringBuilder.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="429" column="0" selection-start="12939" selection-end="12939" vertical-scroll-proportion="0.032258064" />
+ </provider>
+ </entry>
+ <entry file="jar://C:/Program Files (x86)/Java/jdk1.6.0_33/src.zip!/java/lang/ClassLoader.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="322" column="0" selection-start="11967" selection-end="11967" vertical-scroll-proportion="0.24408014" />
+ </provider>
+ </entry>
+ <entry file="jar://C:/Program Files (x86)/Java/jdk1.6.0_33/src.zip!/java/lang/Object.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="133" column="0" selection-start="6113" selection-end="6113" vertical-scroll-proportion="0.0" />
+ </provider>
+ </entry>
+ <entry file="jar://C:/Program Files (x86)/Java/jdk1.6.0_33/src.zip!/java/util/ArrayList.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="215" column="0" selection-start="8342" selection-end="8342" vertical-scroll-proportion="0.0" />
+ </provider>
+ </entry>
+ <entry file="jar://$PROJECT_DIR$/../../../Web/src/WEB-INF/lib/MapGuideApiEx-sources.jar!/org/osgeo/mapguide/MgFeatureSchemaCollection.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="210" column="26" selection-start="6412" selection-end="6412" vertical-scroll-proportion="0.0" />
+ </provider>
+ </entry>
+ <entry file="jar://$PROJECT_DIR$/../../../Web/src/WEB-INF/lib/MapGuideApiEx-sources.jar!/org/osgeo/mapguide/MgFeatureSchema.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="79" column="51" selection-start="2059" selection-end="2059" vertical-scroll-proportion="0.60830325" />
+ </provider>
+ </entry>
+ <entry file="jar://$PROJECT_DIR$/../../../Web/src/WEB-INF/lib/MapGuideApiEx-sources.jar!/org/osgeo/mapguide/MgByteProperty.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="16" column="14" selection-start="491" selection-end="491" vertical-scroll-proportion="-0.6895943" />
+ </provider>
+ </entry>
+ <entry file="jar://$PROJECT_DIR$/../../../Web/src/WEB-INF/lib/MapGuideApiEx-sources.jar!/org/osgeo/mapguide/MgBatchPropertyCollection.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="116" column="0" selection-start="3461" selection-end="3461" vertical-scroll-proportion="0.33212996" />
+ </provider>
+ </entry>
+ <entry file="jar://$PROJECT_DIR$/../../../Web/src/WEB-INF/lib/MapGuideApiEx-sources.jar!/org/osgeo/mapguide/MgPropertyDefinitionCollection.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="248" column="13" selection-start="7649" selection-end="7649" vertical-scroll-proportion="0.33212996" />
+ </provider>
+ </entry>
+ <entry file="jar://$PROJECT_DIR$/../../../Web/src/WEB-INF/lib/MapGuideApiEx-sources.jar!/org/osgeo/mapguide/MgLayerCollection.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="172" column="71" selection-start="4032" selection-end="4922" vertical-scroll-proportion="0.6502732" />
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/src/MapGuideApiTest.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="1227" column="57" selection-start="58790" selection-end="58790" vertical-scroll-proportion="0.9583333" />
+ </provider>
+ </entry>
+ </component>
+ <component name="masterDetails">
+ <states>
+ <state key="ArtifactsStructureConfigurable.UI">
+ <settings>
+ <artifact-editor />
+ <splitter-proportions>
+ <option name="proportions">
+ <list>
+ <option value="0.2" />
+ </list>
+ </option>
+ </splitter-proportions>
+ </settings>
+ </state>
+ <state key="FacetStructureConfigurable.UI">
+ <settings>
+ <last-edited>No facets are configured</last-edited>
+ <splitter-proportions>
+ <option name="proportions">
+ <list>
+ <option value="0.2" />
+ </list>
+ </option>
+ </splitter-proportions>
+ </settings>
+ </state>
+ <state key="GlobalLibrariesConfigurable.UI">
+ <settings>
+ <splitter-proportions>
+ <option name="proportions">
+ <list>
+ <option value="0.2" />
+ </list>
+ </option>
+ </splitter-proportions>
+ </settings>
+ </state>
+ <state key="JdkListConfigurable.UI">
+ <settings>
+ <last-edited>1.6</last-edited>
+ <splitter-proportions>
+ <option name="proportions">
+ <list>
+ <option value="0.2" />
+ </list>
+ </option>
+ </splitter-proportions>
+ </settings>
+ </state>
+ <state key="ModuleStructureConfigurable.UI">
+ <settings>
+ <last-edited>MapGuideApiExTest</last-edited>
+ <splitter-proportions>
+ <option name="proportions">
+ <list>
+ <option value="0.2" />
+ </list>
+ </option>
+ </splitter-proportions>
+ </settings>
+ </state>
+ <state key="ProjectJDKs.UI">
+ <settings>
+ <splitter-proportions>
+ <option name="proportions">
+ <list>
+ <option value="0.2" />
+ </list>
+ </option>
+ </splitter-proportions>
+ </settings>
+ </state>
+ <state key="ProjectLibrariesConfigurable.UI">
+ <settings>
+ <splitter-proportions>
+ <option name="proportions">
+ <list>
+ <option value="0.2" />
+ </list>
+ </option>
+ </splitter-proportions>
+ </settings>
+ </state>
+ </states>
+ </component>
+</project>
+
Deleted: trunk/MgDev/UnitTest/Common/JavaApiExTest/MapGuideApiExTest.iml
===================================================================
--- sandbox/jng/swig-java/UnitTest/Common/JavaApiExTest/MapGuideApiExTest.iml 2012-12-08 14:59:43 UTC (rev 7251)
+++ trunk/MgDev/UnitTest/Common/JavaApiExTest/MapGuideApiExTest.iml 2013-01-12 03:36:03 UTC (rev 7297)
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
- </content>
- <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
- <orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module-library" exported="">
- <library>
- <CLASSES>
- <root url="jar://$MODULE_DIR$/../../../Web/src/WEB-INF/lib/MapGuideApiEx.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES>
- <root url="jar://$MODULE_DIR$/../../../Web/src/WEB-INF/lib/MapGuideApiEx-sources.jar!/" />
- </SOURCES>
- </library>
- </orderEntry>
- </component>
-</module>
-
Copied: trunk/MgDev/UnitTest/Common/JavaApiExTest/MapGuideApiExTest.iml (from rev 7251, sandbox/jng/swig-java/UnitTest/Common/JavaApiExTest/MapGuideApiExTest.iml)
===================================================================
--- trunk/MgDev/UnitTest/Common/JavaApiExTest/MapGuideApiExTest.iml (rev 0)
+++ trunk/MgDev/UnitTest/Common/JavaApiExTest/MapGuideApiExTest.iml 2013-01-12 03:36:03 UTC (rev 7297)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+ </content>
+ <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module-library" exported="">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../Web/src/WEB-INF/lib/MapGuideApiEx.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="jar://$MODULE_DIR$/../../../Web/src/WEB-INF/lib/MapGuideApiEx-sources.jar!/" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ </component>
+</module>
+
Property changes on: trunk/MgDev/UnitTest/Common/JavaApiExTest/src
___________________________________________________________________
Added: bugtraq:number
+ true
Deleted: trunk/MgDev/UnitTest/Common/JavaApiExTest/src/AssertException.java
===================================================================
--- sandbox/jng/swig-java/UnitTest/Common/JavaApiExTest/src/AssertException.java 2012-12-08 14:59:43 UTC (rev 7251)
+++ trunk/MgDev/UnitTest/Common/JavaApiExTest/src/AssertException.java 2013-01-12 03:36:03 UTC (rev 7297)
@@ -1,12 +0,0 @@
-/**
- * Created with IntelliJ IDEA.
- * User: Jackie Ng
- * Date: 26/11/12
- * Time: 11:46 PM
- * To change this template use File | Settings | File Templates.
- */
-public class AssertException extends RuntimeException {
- public AssertException(String msg) {
- super(msg);
- }
-}
Copied: trunk/MgDev/UnitTest/Common/JavaApiExTest/src/AssertException.java (from rev 7251, sandbox/jng/swig-java/UnitTest/Common/JavaApiExTest/src/AssertException.java)
===================================================================
--- trunk/MgDev/UnitTest/Common/JavaApiExTest/src/AssertException.java (rev 0)
+++ trunk/MgDev/UnitTest/Common/JavaApiExTest/src/AssertException.java 2013-01-12 03:36:03 UTC (rev 7297)
@@ -0,0 +1,12 @@
+/**
+ * Created with IntelliJ IDEA.
+ * User: Jackie Ng
+ * Date: 26/11/12
+ * Time: 11:46 PM
+ * To change this template use File | Settings | File Templates.
+ */
+public class AssertException extends RuntimeException {
+ public AssertException(String msg) {
+ super(msg);
+ }
+}
Deleted: trunk/MgDev/UnitTest/Common/JavaApiExTest/src/MapGuideApiTest.java
===================================================================
--- sandbox/jng/swig-java/UnitTest/Common/JavaApiExTest/src/MapGuideApiTest.java 2012-12-08 14:59:43 UTC (rev 7251)
+++ trunk/MgDev/UnitTest/Common/JavaApiExTest/src/MapGuideApiTest.java 2013-01-12 03:36:03 UTC (rev 7297)
@@ -1,1245 +0,0 @@
-/**
- * Created with IntelliJ IDEA.
- * User: Jackie Ng
- * Date: 26/11/12
- * Time: 11:37 PM
- * To change this template use File | Settings | File Templates.
- */
-import org.osgeo.mapguide.*;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-/**
- * This test harness is to exercise the java.util.Collection implementation of the MapGuide proxy classes that implement it
- * and the common usage scenarios involving them
- */
-public class MapGuideApiTest {
-
- static List<AssertException> assertFailures;
- static String sessionId;
- static String mapName;
-
- public static void main(String [] args) {
- assertFailures = new ArrayList<AssertException>();
- if (args.length == 1) {
- MapGuideJavaApiEx.MgInitializeWebTier(args[0]);
- } else {
- if (System.getProperty("os.name").startsWith("Windows")) {
- MapGuideJavaApiEx.MgInitializeWebTier("C:\\Program Files\\OSGeo\\MapGuide\\Web\\www\\webconfig.ini");
- } else {
- MapGuideJavaApiEx.MgInitializeWebTier("/usr/local/mapguideopensource/webserverextensions/www/webconfig.ini");
- }
- }
-
- MgUserInformation userInfo = new MgUserInformation("Administrator", "admin");
- MgSiteConnection siteConn = new MgSiteConnection();
- siteConn.open(userInfo);
-
- MgSite site = siteConn.getSite();
- sessionId = site.createSession();
- userInfo.setMgSessionId(sessionId);
-
- MgMap map = new MgMap(siteConn);
- MgResourceService resSvc = (MgResourceService)siteConn.createService(MgServiceType.ResourceService);
- MgResourceIdentifier mdfId = new MgResourceIdentifier("Library://Samples/Sheboygan/Maps/Sheboygan.MapDefinition");
- mapName = mdfId.getName();
- map.create(mdfId, mapName);
-
- MgSelection sel = new MgSelection(map);
- sel.save(resSvc, mapName);
-
- MgResourceIdentifier mapStateId = new MgResourceIdentifier("Session:" + sessionId + "//" + mapName + "." + MgResourceType.Map);
- map.save(resSvc, mapStateId);
-
- System.out.println("Running tests");
- runTests(siteConn, map);
- System.exit(assertFailures.size());
- }
-
- private static void assertCondition(boolean condition, String failureMsg) {
- if (!condition)
- throw new AssertException(failureMsg);
- }
-
- private static void runTests(MgSiteConnection siteConn, MgMap map) {
- System.out.print(testFeatureSchemaCollection() ? "." : "F");
- System.out.print(testClassDefinitionCollection() ? "." : "F");
- System.out.print(testPropertyDefinitionCollection() ? "." : "F");
- System.out.print(testPropertyCollection() ? "." : "F");
- System.out.print(testStringCollection() ? "." : "F");
- System.out.print(testReadOnlyLayerCollection(siteConn, map) ? "." : "F");
- System.out.print(testLayerCollection(siteConn, map) ? "." : "F");
- System.out.print(testLayerGroupCollection(siteConn, map) ? "." : "F");
- System.out.println();
- if (assertFailures.size() > 0) {
- int i = 1;
- for (AssertException ex : assertFailures) {
- System.out.println("Assertion Failure: " + i);
- ex.printStackTrace(System.out);
- i++;
- }
- }
- }
-
- private static boolean testReadOnlyLayerCollection(MgSiteConnection siteConn, MgMap map) {
- try {
-
- MgFeatureQueryOptions query1 = new MgFeatureQueryOptions();
- query1.setFilter("Autogenerated_SDF_ID < 4");
-
- MgFeatureQueryOptions query2 = new MgFeatureQueryOptions();
- query2.setFilter("Autogenerated_SDF_ID < 4");
-
- MgLayerCollection layers = map.getLayers();
- MgLayerBase item1 = layers.getItem("Parcels");
- MgLayerBase item2 = layers.getItem("Buildings");
-
- MgFeatureReader fr1 = item1.selectFeatures(query1);
- MgFeatureReader fr2 = item2.selectFeatures(query2);
-
- MgResourceService resSvc = (MgResourceService)siteConn.createService(MgServiceType.ResourceService);
- MgSelection sel = new MgSelection(map);
- sel.open(resSvc, map.getName());
- sel.fromXml(""); //Clear
- try {
- sel.addFeatures(item1, fr1, 0);
- sel.addFeatures(item2, fr2, 0);
- } finally{
- fr1.close();
- fr2.close();
- }
-
- sel.save(resSvc);
-
- //Now we can test the collection
- MgReadOnlyLayerCollection items = sel.getLayers();
-
- assertCondition(items.getCount() == 2, "Expected 2 items");
-
- //NOTE: Possible bug in ordering of MgReadOnlyLayerCollection here (I had to reverse the order of layers
- //being tested) Nevertheless, were testing that the ordering (whether correct or not) is the same when iterated
- //in both the classical and iterative methods
-
- int i = 0;
- //Looping the classic way
- for (i = 0; i < items.getCount(); i++) {
- switch (i){
- case 0:
- assertCondition(items.getItem(i).getName().equals("Buildings"), "Expected item #" + (i+1) + " to be Buildings");
- break;
- case 1:
- assertCondition(items.getItem(i).getName().equals("Parcels"), "Expected item #" + (i+1) + " to be Parcels");
- break;
- }
- }
-
- //Looping the iterative way
- i = 0;
- for (MgLayerBase item : items) {
- String itemName = item.getName();
- switch (i){
- case 0:
- assertCondition(itemName.equals("Buildings"), "Expected item #" + (i+1) + " to be Buildings");
- break;
- case 1:
- assertCondition(itemName.equals("Parcels"), "Expected item #" + (i+1) + " to be Parcels");
- break;
- }
- i++;
- }
- return true;
- }
- catch (MgException ex) {
- assertCondition(false, ex.getMessage());
- }
- catch (AssertException ex) {
- assertFailures.add(ex);
- }
- return false;
- }
-
- private static boolean testStringCollection() {
- try {
- MgStringCollection items = new MgStringCollection();
- String item1 = "Item1";
- String item2 = "Item2";
- String item3 = "Item3";
- String item4 = "Item4";
-
- //Items inserted the MapGuide API way
- items.addItem(item1);
- items.addItem(item2);
- items.addItem(item3);
-
- assertCondition(items.getCount() == 3, "Expected 3 items");
- assertCondition(!items.isEmpty(), "Expected non-empty item collection");
-
- int i = 0;
- //Looping the classic way
- for (i = 0; i < items.getCount(); i++) {
- switch (i){
- case 0:
- assertCondition(items.getItem(i).equals("Item1"), "Expected item #" + (i+1) + " to be Item1");
- break;
- case 1:
- assertCondition(items.getItem(i).equals("Item2"), "Expected item #" + (i+1) + " to be Item2");
- break;
- case 2:
- assertCondition(items.getItem(i).equals("Item3"), "Expected item #" + (i+1) + " to be Item3");
- break;
- }
- }
-
- //Looping the iterative way
- i = 0;
- for (String item : items) {
- String itemName = item;
- switch (i){
- case 0:
- assertCondition(itemName.equals("Item1"), "Expected item #" + (i+1) + " to be Item1");
- break;
- case 1:
- assertCondition(itemName.equals("Item2"), "Expected item #" + (i+1) + " to be Item2");
- break;
- case 2:
- assertCondition(itemName.equals("Item3"), "Expected item #" + (i+1) + " to be Item3");
- break;
- }
- i++;
- }
-
- items.clear();
- assertCondition(items.getCount() == 0, "Expected empty item collection");
- assertCondition(items.isEmpty(), "Expected empty item collection");
-
- //Now test through java.util.Collection facade
- Collection<String> facade = items;
- //add()
- assertCondition(facade.add(item1), "Could not add item1 the java.util.Collection way");
- assertCondition(facade.add(item2), "Could not add item2 the java.util.Collection way");
- assertCondition(facade.add(item3), "Could not add item3 the java.util.Collection way");
-
- assertCondition(facade.size() == 3, "Expected 3 items");
- assertCondition(!facade.isEmpty(), "Expected non-empty item collection");
-
- //contains()
- assertCondition(facade.contains(item1), "item1 should exist");
- assertCondition(facade.contains(item2), "item2 should exist");
- assertCondition(facade.contains(item3), "item3 should exist");
-
- ArrayList<String> testCollection = new ArrayList<String>();
- testCollection.add(item1);
- testCollection.add(item2);
- testCollection.add(item3);
-
- //containsAll()
- assertCondition(facade.containsAll(testCollection), "All items in test collection should match");
- testCollection.clear();
- testCollection.add(item1);
- testCollection.add(item4);
- assertCondition(!facade.containsAll(testCollection), "Should not have matched test collection");
-
- facade.clear();
- assertCondition(facade.size() == 0, "Expected 0 items");
- assertCondition(facade.isEmpty(), "Expected empty item collection");
-
- //addAll()
- testCollection.clear();
- testCollection.add(item1);
- testCollection.add(item2);
- testCollection.add(item3);
- assertCondition(facade.addAll(testCollection), "Expected addAll() success");
- assertCondition(facade.size() == 3, "Expected 3 items");
- assertCondition(!facade.isEmpty(), "Expected non-empty item collection");
-
- //remove()
- assertCondition(!facade.remove(item4), "Expected remove() of non-existent item to return false");
- assertCondition(!facade.remove(new MgClassDefinition()), "Expected remove() of different type to return false");
- assertCondition(facade.remove(item2), "Expected remove() of item2 to return true");
-
- //removeAll()
- testCollection.remove(item2);
- assertCondition(facade.removeAll(testCollection), "Expected removeAll() to succeed");
-
- //retainAll()
- assertCondition(facade.add(item1), "Could not add item1 the java.util.Collection way");
- assertCondition(facade.add(item2), "Could not add item2 the java.util.Collection way");
- assertCondition(facade.add(item3), "Could not add item3 the java.util.Collection way");
- assertCondition(facade.size() == 3, "Expected 3 schemas");
- assertCondition(!facade.isEmpty(), "Expected non-empty schema collection");
-
- testCollection.clear();
- testCollection.add(item1);
- testCollection.add(item3);
- assertCondition(facade.retainAll(testCollection), "Expected retainAll() to succeed");
- assertCondition(facade.contains(item1), "Expected item1 to exist");
- assertCondition(!facade.contains(item2), "Expected item2 to not exist");
- assertCondition(facade.contains(item3), "Expected item3 to exist");
-
- //toArray()
- Object[] itemArray = facade.toArray();
- assertCondition(itemArray != null, "Expected non-null item array");
- assertCondition(itemArray.length == 2, "Expected 2 item array");
- for (Object o : itemArray) {
- assertCondition(o instanceof String, "Expected item to be String");
- }
- String[] fitems = facade.toArray(new String[0]);
- assertCondition(fitems != null, "Expected non-null item array");
- assertCondition(fitems.length == 2, "Expected 2 item array");
-
- fitems = facade.toArray(new String[1]);
- assertCondition(fitems != null, "Expected non-null item array");
- assertCondition(fitems.length == 2, "Expected 2 item array");
-
- fitems = facade.toArray(new String[3]);
- assertCondition(fitems != null, "Expected non-null item array");
- assertCondition(fitems.length == 3, "Expected 3 item array");
- assertCondition(fitems[0] != null, "Expected non-null item #1");
- assertCondition(fitems[1] != null, "Expected non-null item #2");
- assertCondition(fitems[2] == null, "Expected null item #3");
-
- return true;
- }
- catch (MgException ex) {
- assertCondition(false, ex.getMessage());
- }
- catch (AssertException ex) {
- assertFailures.add(ex);
- }
- return false;
- }
-
- private static boolean testPropertyCollection() {
- try {
- MgPropertyCollection items = new MgPropertyCollection();
- MgProperty item1 = new MgStringProperty("Item1", "Hello World");
- MgProperty item2 = new MgInt32Property("Item2", 42);
- MgProperty item3 = new MgBooleanProperty("Item3", false);
- MgProperty item4 = new MgByteProperty("Item4", (short)4);
-
- //Items inserted the MapGuide API way
- items.addItem(item1);
- items.addItem(item2);
- items.addItem(item3);
-
- assertCondition(items.getCount() == 3, "Expected 3 items");
- assertCondition(!items.isEmpty(), "Expected non-empty item collection");
-
- int i = 0;
- //Looping the classic way
- for (i = 0; i < items.getCount(); i++) {
- switch (i){
- case 0:
- assertCondition(items.getItem(i).getName().equals("Item1"), "Expected item #" + (i+1) + " to be Item1");
- break;
- case 1:
- assertCondition(items.getItem(i).getName().equals("Item2"), "Expected item #" + (i+1) + " to be Item2");
- break;
- case 2:
- assertCondition(items.getItem(i).getName().equals("Item3"), "Expected item #" + (i+1) + " to be Item3");
- break;
- }
- }
-
- //Looping the iterative way
- i = 0;
- for (MgProperty item : items) {
- String itemName = item.getName();
- switch (i){
- case 0:
- assertCondition(itemName.equals("Item1"), "Expected item #" + (i+1) + " to be Item1");
- break;
- case 1:
- assertCondition(itemName.equals("Item2"), "Expected item #" + (i+1) + " to be Item2");
- break;
- case 2:
- assertCondition(itemName.equals("Item3"), "Expected item #" + (i+1) + " to be Item3");
- break;
- }
- i++;
- }
-
- items.clear();
- assertCondition(items.getCount() == 0, "Expected empty item collection");
- assertCondition(items.isEmpty(), "Expected empty item collection");
-
- //Now test through java.util.Collection facade
- Collection<MgProperty> facade = items;
- //add()
- assertCondition(facade.add(item1), "Could not add item1 the java.util.Collection way");
- assertCondition(facade.add(item2), "Could not add item2 the java.util.Collection way");
- assertCondition(facade.add(item3), "Could not add item3 the java.util.Collection way");
-
- assertCondition(facade.size() == 3, "Expected 3 items");
- assertCondition(!facade.isEmpty(), "Expected non-empty item collection");
-
- //contains()
- assertCondition(facade.contains(item1), "item1 should exist");
- assertCondition(facade.contains(item2), "item2 should exist");
- assertCondition(facade.contains(item3), "item3 should exist");
-
- ArrayList<MgProperty> testCollection = new ArrayList<MgProperty>();
- testCollection.add(item1);
- testCollection.add(item2);
- testCollection.add(item3);
-
- //containsAll()
- assertCondition(facade.containsAll(testCollection), "All items in test collection should match");
- testCollection.clear();
- testCollection.add(item1);
- testCollection.add(item4);
- assertCondition(!facade.containsAll(testCollection), "Should not have matched test collection");
-
- facade.clear();
- assertCondition(facade.size() == 0, "Expected 0 items");
- assertCondition(facade.isEmpty(), "Expected empty item collection");
-
- //addAll()
- testCollection.clear();
- testCollection.add(item1);
- testCollection.add(item2);
- testCollection.add(item3);
- assertCondition(facade.addAll(testCollection), "Expected addAll() success");
- assertCondition(facade.size() == 3, "Expected 3 items");
- assertCondition(!facade.isEmpty(), "Expected non-empty item collection");
-
- //remove()
- assertCondition(!facade.remove(item4), "Expected remove() of non-existent item to return false");
- assertCondition(!facade.remove(new MgClassDefinition()), "Expected remove() of different type to return false");
- assertCondition(facade.remove(item2), "Expected remove() of item2 to return true");
-
- //removeAll()
- testCollection.remove(item2);
- assertCondition(facade.removeAll(testCollection), "Expected removeAll() to succeed");
-
- //retainAll()
- assertCondition(facade.add(item1), "Could not add item1 the java.util.Collection way");
- assertCondition(facade.add(item2), "Could not add item2 the java.util.Collection way");
- assertCondition(facade.add(item3), "Could not add item3 the java.util.Collection way");
- assertCondition(facade.size() == 3, "Expected 3 schemas");
- assertCondition(!facade.isEmpty(), "Expected non-empty schema collection");
-
- testCollection.clear();
- testCollection.add(item1);
- testCollection.add(item3);
- assertCondition(facade.retainAll(testCollection), "Expected retainAll() to succeed");
- assertCondition(facade.contains(item1), "Expected item1 to exist");
- assertCondition(!facade.contains(item2), "Expected item2 to not exist");
- assertCondition(facade.contains(item3), "Expected item3 to exist");
-
- //toArray()
- Object[] itemArray = facade.toArray();
- assertCondition(itemArray != null, "Expected non-null item array");
- assertCondition(itemArray.length == 2, "Expected 2 item array");
- i = 0;
- for (Object o : itemArray) {
- assertCondition(o instanceof MgProperty, "Expected item to be MgProperty");
- switch(i) {
- case 0:
- assertCondition(o instanceof MgStringProperty, "Expected item to be MgStringProperty");
- break;
- case 1:
- assertCondition(o instanceof MgBooleanProperty, "Expected item to be MgBooleanProperty");
- break;
- }
- i++;
- }
-
- MgProperty[] fitems = facade.toArray(new MgProperty[0]);
- assertCondition(fitems != null, "Expected non-null item array");
- assertCondition(fitems.length == 2, "Expected 2 item array");
-
- fitems = facade.toArray(new MgProperty[1]);
- assertCondition(fitems != null, "Expected non-null item array");
- assertCondition(fitems.length == 2, "Expected 2 item array");
-
- fitems = facade.toArray(new MgProperty[3]);
- assertCondition(fitems != null, "Expected non-null item array");
- assertCondition(fitems.length == 3, "Expected 3 item array");
- assertCondition(fitems[0] != null, "Expected non-null item #1");
- assertCondition(fitems[1] != null, "Expected non-null item #2");
- assertCondition(fitems[2] == null, "Expected null item #3");
-
- return true;
- }
- catch (MgException ex) {
- assertCondition(false, ex.getMessage());
- }
- catch (AssertException ex) {
- assertFailures.add(ex);
- }
- return false;
- }
-
- private static boolean testClassDefinitionCollection() {
- try {
- MgFeatureSchema parent = new MgFeatureSchema("Parent", "");
- MgClassDefinitionCollection items = parent.getClasses();
- MgClassDefinition item1 = new MgClassDefinition(); item1.setName("Item1");
- MgClassDefinition item2 = new MgClassDefinition(); item2.setName("Item2");
- MgClassDefinition item3 = new MgClassDefinition(); item3.setName("Item3");
- MgClassDefinition item4 = new MgClassDefinition(); item4.setName("Item4");
-
- //Items inserted the MapGuide API way
- items.addItem(item1);
- items.addItem(item2);
- items.addItem(item3);
-
- assertCondition(items.getCount() == 3, "Expected 3 items");
- assertCondition(!items.isEmpty(), "Expected non-empty item collection");
-
- int i = 0;
- //Looping the classic way
- for (i = 0; i < items.getCount(); i++) {
- switch (i){
- case 0:
- assertCondition(items.getItem(i).getName().equals("Item1"), "Expected item #" + (i+1) + " to be Item1");
- break;
- case 1:
- assertCondition(items.getItem(i).getName().equals("Item2"), "Expected item #" + (i+1) + " to be Item2");
- break;
- case 2:
- assertCondition(items.getItem(i).getName().equals("Item3"), "Expected item #" + (i+1) + " to be Item3");
- break;
- }
- }
-
- //Looping the iterative way
- i = 0;
- for (MgClassDefinition item : items) {
- String itemName = item.getName();
- switch (i){
- case 0:
- assertCondition(itemName.equals("Item1"), "Expected item #" + (i+1) + " to be Item1");
- break;
- case 1:
- assertCondition(itemName.equals("Item2"), "Expected item #" + (i+1) + " to be Item2");
- break;
- case 2:
- assertCondition(itemName.equals("Item3"), "Expected item #" + (i+1) + " to be Item3");
- break;
- }
- i++;
- }
-
- items.clear();
- assertCondition(items.getCount() == 0, "Expected empty item collection");
- assertCondition(items.isEmpty(), "Expected empty item collection");
-
- //Now test through java.util.Collection facade
- Collection<MgClassDefinition> facade = items;
- //add()
- assertCondition(facade.add(item1), "Could not add item1 the java.util.Collection way");
- assertCondition(facade.add(item2), "Could not add item2 the java.util.Collection way");
- assertCondition(facade.add(item3), "Could not add item3 the java.util.Collection way");
-
- assertCondition(facade.size() == 3, "Expected 3 items");
- assertCondition(!facade.isEmpty(), "Expected non-empty item collection");
-
- //contains()
- assertCondition(facade.contains(item1), "item1 should exist");
- assertCondition(facade.contains(item2), "item2 should exist");
- assertCondition(facade.contains(item3), "item3 should exist");
-
- ArrayList<MgClassDefinition> testCollection = new ArrayList<MgClassDefinition>();
- testCollection.add(item1);
- testCollection.add(item2);
- testCollection.add(item3);
-
- //containsAll()
- assertCondition(facade.containsAll(testCollection), "All items in test collection should match");
- testCollection.clear();
- testCollection.add(item1);
- testCollection.add(item4);
- assertCondition(!facade.containsAll(testCollection), "Should not have matched test collection");
-
- facade.clear();
- assertCondition(facade.size() == 0, "Expected 0 items");
- assertCondition(facade.isEmpty(), "Expected empty item collection");
-
- //addAll()
- testCollection.clear();
- testCollection.add(item1);
- testCollection.add(item2);
- testCollection.add(item3);
- assertCondition(facade.addAll(testCollection), "Expected addAll() success");
- assertCondition(facade.size() == 3, "Expected 3 items");
- assertCondition(!facade.isEmpty(), "Expected non-empty item collection");
-
- //remove()
- assertCondition(!facade.remove(item4), "Expected remove() of non-existent item to return false");
- assertCondition(!facade.remove(new MgFeatureSchema()), "Expected remove() of different type to return false");
- assertCondition(facade.remove(item2), "Expected remove() of item2 to return true");
-
- //removeAll()
- testCollection.remove(item2);
- assertCondition(facade.removeAll(testCollection), "Expected removeAll() to succeed");
-
- //retainAll()
- assertCondition(facade.add(item1), "Could not add item1 the java.util.Collection way");
- assertCondition(facade.add(item2), "Could not add item2 the java.util.Collection way");
- assertCondition(facade.add(item3), "Could not add item3 the java.util.Collection way");
- assertCondition(facade.size() == 3, "Expected 3 schemas");
- assertCondition(!facade.isEmpty(), "Expected non-empty schema collection");
-
- testCollection.clear();
- testCollection.add(item1);
- testCollection.add(item3);
- assertCondition(facade.retainAll(testCollection), "Expected retainAll() to succeed");
- assertCondition(facade.contains(item1), "Expected item1 to exist");
- assertCondition(!facade.contains(item2), "Expected item2 to not exist");
- assertCondition(facade.contains(item3), "Expected item3 to exist");
-
- //toArray()
- Object[] itemArray = facade.toArray();
- assertCondition(itemArray != null, "Expected non-null item array");
- assertCondition(itemArray.length == 2, "Expected 2 item array");
- for (Object o : itemArray) {
- assertCondition(o instanceof MgClassDefinition, "Expected item to be MgClassDefinition");
- }
- MgClassDefinition[] fitems = facade.toArray(new MgClassDefinition[0]);
- assertCondition(fitems != null, "Expected non-null item array");
- assertCondition(fitems.length == 2, "Expected 2 item array");
-
- fitems = facade.toArray(new MgClassDefinition[1]);
- assertCondition(fitems != null, "Expected non-null item array");
- assertCondition(fitems.length == 2, "Expected 2 item array");
-
- fitems = facade.toArray(new MgClassDefinition[3]);
- assertCondition(fitems != null, "Expected non-null item array");
- assertCondition(fitems.length == 3, "Expected 3 item array");
- assertCondition(fitems[0] != null, "Expected non-null item #1");
- assertCondition(fitems[1] != null, "Expected non-null item #2");
- assertCondition(fitems[2] == null, "Expected null item #3");
-
- return true;
- }
- catch (MgException ex) {
- assertCondition(false, ex.getMessage());
- }
- catch (AssertException ex) {
- assertFailures.add(ex);
- }
- return false;
- }
-
- private static boolean testFeatureSchemaCollection() {
- try {
- MgFeatureSchemaCollection items = new MgFeatureSchemaCollection();
- MgFeatureSchema item1 = new MgFeatureSchema("Item1", "");
- MgFeatureSchema item2 = new MgFeatureSchema("Item2", "");
- MgFeatureSchema item3 = new MgFeatureSchema("Item3", "");
- MgFeatureSchema item4 = new MgFeatureSchema("Item4", "");
-
- //Items inserted the MapGuide API way
- items.addItem(item1);
- items.addItem(item2);
- items.addItem(item3);
-
- assertCondition(items.getCount() == 3, "Expected 3 items");
- assertCondition(!items.isEmpty(), "Expected non-empty item collection");
-
- int i = 0;
- //Looping the classic way
- for (i = 0; i < items.getCount(); i++) {
- switch (i){
- case 0:
- assertCondition(items.getItem(i).getName().equals("Item1"), "Expected item #" + (i+1) + " to be Item1");
- break;
- case 1:
- assertCondition(items.getItem(i).getName().equals("Item2"), "Expected item #" + (i+1) + " to be Item2");
- break;
- case 2:
- assertCondition(items.getItem(i).getName().equals("Item3"), "Expected item #" + (i+1) + " to be Item3");
- break;
- }
- }
-
- //Looping the iterative way
- i = 0;
- for (MgFeatureSchema item : items) {
- String itemName = item.getName();
- switch (i){
- case 0:
- assertCondition(itemName.equals("Item1"), "Expected item #" + (i+1) + " to be Item1");
- break;
- case 1:
- assertCondition(itemName.equals("Item2"), "Expected item #" + (i+1) + " to be Item2");
- break;
- case 2:
- assertCondition(itemName.equals("Item3"), "Expected item #" + (i+1) + " to be Item3");
- break;
- }
- i++;
- }
-
- items.clear();
- assertCondition(items.getCount() == 0, "Expected empty item collection");
- assertCondition(items.isEmpty(), "Expected empty item collection");
-
- //Now test through java.util.Collection facade
- Collection<MgFeatureSchema> facade = items;
- //add()
- assertCondition(facade.add(item1), "Could not add item1 the java.util.Collection way");
- assertCondition(facade.add(item2), "Could not add item2 the java.util.Collection way");
- assertCondition(facade.add(item3), "Could not add item3 the java.util.Collection way");
-
- assertCondition(facade.size() == 3, "Expected 3 items");
- assertCondition(!facade.isEmpty(), "Expected non-empty item collection");
-
- //contains()
- assertCondition(facade.contains(item1), "item1 should exist");
- assertCondition(facade.contains(item2), "item2 should exist");
- assertCondition(facade.contains(item3), "item3 should exist");
-
- ArrayList<MgFeatureSchema> testCollection = new ArrayList<MgFeatureSchema>();
- testCollection.add(item1);
- testCollection.add(item2);
- testCollection.add(item3);
-
- //containsAll()
- assertCondition(facade.containsAll(testCollection), "All items in test collection should match");
- testCollection.clear();
- testCollection.add(item1);
- testCollection.add(item4);
- assertCondition(!facade.containsAll(testCollection), "Should not have matched test collection");
-
- facade.clear();
- assertCondition(facade.size() == 0, "Expected 0 items");
- assertCondition(facade.isEmpty(), "Expected empty item collection");
-
- //addAll()
- testCollection.clear();
- testCollection.add(item1);
- testCollection.add(item2);
- testCollection.add(item3);
- assertCondition(facade.addAll(testCollection), "Expected addAll() success");
- assertCondition(facade.size() == 3, "Expected 3 items");
- assertCondition(!facade.isEmpty(), "Expected non-empty item collection");
-
- //remove()
- assertCondition(!facade.remove(item4), "Expected remove() of non-existent item to return false");
- assertCondition(!facade.remove(new MgClassDefinition()), "Expected remove() of different type to return false");
- assertCondition(facade.remove(item2), "Expected remove() of item2 to return true");
-
- //removeAll()
- testCollection.remove(item2);
- assertCondition(facade.removeAll(testCollection), "Expected removeAll() to succeed");
-
- //retainAll()
- assertCondition(facade.add(item1), "Could not add item1 the java.util.Collection way");
- assertCondition(facade.add(item2), "Could not add item2 the java.util.Collection way");
- assertCondition(facade.add(item3), "Could not add item3 the java.util.Collection way");
- assertCondition(facade.size() == 3, "Expected 3 schemas");
- assertCondition(!facade.isEmpty(), "Expected non-empty schema collection");
-
- testCollection.clear();
- testCollection.add(item1);
- testCollection.add(item3);
- assertCondition(facade.retainAll(testCollection), "Expected retainAll() to succeed");
- assertCondition(facade.contains(item1), "Expected item1 to exist");
- assertCondition(!facade.contains(item2), "Expected item2 to not exist");
- assertCondition(facade.contains(item3), "Expected item3 to exist");
-
- //toArray()
- Object[] itemArray = facade.toArray();
- assertCondition(itemArray != null, "Expected non-null item array");
- assertCondition(itemArray.length == 2, "Expected 2 item array");
- for (Object o : itemArray) {
- assertCondition(o instanceof MgFeatureSchema, "Expected item to be MgFeatureSchema");
- }
- MgFeatureSchema[] fitems = facade.toArray(new MgFeatureSchema[0]);
- assertCondition(fitems != null, "Expected non-null item array");
- assertCondition(fitems.length == 2, "Expected 2 item array");
-
- fitems = facade.toArray(new MgFeatureSchema[1]);
- assertCondition(fitems != null, "Expected non-null item array");
- assertCondition(fitems.length == 2, "Expected 2 item array");
-
- fitems = facade.toArray(new MgFeatureSchema[3]);
- assertCondition(fitems != null, "Expected non-null item array");
- assertCondition(fitems.length == 3, "Expected 3 item array");
- assertCondition(fitems[0] != null, "Expected non-null item #1");
- assertCondition(fitems[1] != null, "Expected non-null item #2");
- assertCondition(fitems[2] == null, "Expected null item #3");
-
- return true;
- }
- catch (MgException ex) {
- assertCondition(false, ex.getMessage());
- }
- catch (AssertException ex) {
- assertFailures.add(ex);
- }
- return false;
- }
-
- private static boolean testPropertyDefinitionCollection() {
- try {
- MgClassDefinition parent = new MgClassDefinition();
- parent.setName("Parent");
- MgPropertyDefinitionCollection items = parent.getProperties();
- MgPropertyDefinition item1 = new MgDataPropertyDefinition("Item1");
- MgPropertyDefinition item2 = new MgDataPropertyDefinition("Item2");
- MgPropertyDefinition item3 = new MgDataPropertyDefinition("Item3");
- MgPropertyDefinition item4 = new MgDataPropertyDefinition("Item4");
-
- //Items inserted the MapGuide API way
- items.addItem(item1);
- items.addItem(item2);
- items.addItem(item3);
-
- assertCondition(items.getCount() == 3, "Expected 3 items");
- assertCondition(!items.isEmpty(), "Expected non-empty item collection");
-
- int i = 0;
- //Looping the classic way
- for (i = 0; i < items.getCount(); i++) {
- switch (i){
- case 0:
- assertCondition(items.getItem(i).getName().equals("Item1"), "Expected item #" + (i+1) + " to be Item1");
- break;
- case 1:
- assertCondition(items.getItem(i).getName().equals("Item2"), "Expected item #" + (i+1) + " to be Item2");
- break;
- case 2:
- assertCondition(items.getItem(i).getName().equals("Item3"), "Expected item #" + (i+1) + " to be Item3");
- break;
- }
- }
-
- //Looping the iterative way
- i = 0;
- for (MgPropertyDefinition item : items) {
- String itemName = item.getName();
- switch (i){
- case 0:
- assertCondition(itemName.equals("Item1"), "Expected item #" + (i+1) + " to be Item1");
- break;
- case 1:
- assertCondition(itemName.equals("Item2"), "Expected item #" + (i+1) + " to be Item2");
- break;
- case 2:
- assertCondition(itemName.equals("Item3"), "Expected item #" + (i+1) + " to be Item3");
- break;
- }
- i++;
- }
-
- items.clear();
- assertCondition(items.getCount() == 0, "Expected empty item collection");
- assertCondition(items.isEmpty(), "Expected empty item collection");
-
- //Now test through java.util.Collection facade
- Collection<MgPropertyDefinition> facade = items;
- //add()
- assertCondition(facade.add(item1), "Could not add item1 the java.util.Collection way");
- assertCondition(facade.add(item2), "Could not add item2 the java.util.Collection way");
- assertCondition(facade.add(item3), "Could not add item3 the java.util.Collection way");
-
- assertCondition(facade.size() == 3, "Expected 3 items");
- assertCondition(!facade.isEmpty(), "Expected non-empty item collection");
-
- //contains()
- assertCondition(facade.contains(item1), "item1 should exist");
- assertCondition(facade.contains(item2), "item2 should exist");
- assertCondition(facade.contains(item3), "item3 should exist");
-
- ArrayList<MgPropertyDefinition> testCollection = new ArrayList<MgPropertyDefinition>();
- testCollection.add(item1);
- testCollection.add(item2);
- testCollection.add(item3);
-
- //containsAll()
- assertCondition(facade.containsAll(testCollection), "All items in test collection should match");
- testCollection.clear();
- testCollection.add(item1);
- testCollection.add(item4);
- assertCondition(!facade.containsAll(testCollection), "Should not have matched test collection");
-
- facade.clear();
- assertCondition(facade.size() == 0, "Expected 0 items");
- assertCondition(facade.isEmpty(), "Expected empty item collection");
-
- //addAll()
- testCollection.clear();
- testCollection.add(item1);
- testCollection.add(item2);
- testCollection.add(item3);
- assertCondition(facade.addAll(testCollection), "Expected addAll() success");
- assertCondition(facade.size() == 3, "Expected 3 items");
- assertCondition(!facade.isEmpty(), "Expected non-empty item collection");
-
- //remove()
- assertCondition(!facade.remove(item4), "Expected remove() of non-existent item to return false");
- assertCondition(!facade.remove(new MgFeatureSchema()), "Expected remove() of different type to return false");
- assertCondition(facade.remove(item2), "Expected remove() of item2 to return true");
-
- //removeAll()
- testCollection.remove(item2);
- assertCondition(facade.removeAll(testCollection), "Expected removeAll() to succeed");
-
- //retainAll()
- assertCondition(facade.add(item1), "Could not add item1 the java.util.Collection way");
- assertCondition(facade.add(item2), "Could not add item2 the java.util.Collection way");
- assertCondition(facade.add(item3), "Could not add item3 the java.util.Collection way");
- assertCondition(facade.size() == 3, "Expected 3 schemas");
- assertCondition(!facade.isEmpty(), "Expected non-empty schema collection");
-
- testCollection.clear();
- testCollection.add(item1);
- testCollection.add(item3);
- assertCondition(facade.retainAll(testCollection), "Expected retainAll() to succeed");
- assertCondition(facade.contains(item1), "Expected item1 to exist");
- assertCondition(!facade.contains(item2), "Expected item2 to not exist");
- assertCondition(facade.contains(item3), "Expected item3 to exist");
-
- //toArray()
- Object[] itemArray = facade.toArray();
- assertCondition(itemArray != null, "Expected non-null item array");
- assertCondition(itemArray.length == 2, "Expected 2 item array");
- for (Object o : itemArray) {
- assertCondition(o instanceof MgPropertyDefinition, "Expected item to be MgPropertyDefinition");
- }
- MgPropertyDefinition[] fitems = facade.toArray(new MgPropertyDefinition[0]);
- assertCondition(fitems != null, "Expected non-null item array");
- assertCondition(fitems.length == 2, "Expected 2 item array");
-
- fitems = facade.toArray(new MgPropertyDefinition[1]);
- assertCondition(fitems != null, "Expected non-null item array");
- assertCondition(fitems.length == 2, "Expected 2 item array");
-
- fitems = facade.toArray(new MgPropertyDefinition[3]);
- assertCondition(fitems != null, "Expected non-null item array");
- assertCondition(fitems.length == 3, "Expected 3 item array");
- assertCondition(fitems[0] != null, "Expected non-null item #1");
- assertCondition(fitems[1] != null, "Expected non-null item #2");
- assertCondition(fitems[2] == null, "Expected null item #3");
-
- return true;
- }
- catch (MgException ex) {
- assertCondition(false, ex.getMessage());
- }
- catch (AssertException ex) {
- assertFailures.add(ex);
- }
- return false;
- }
-
- private static boolean testLayerCollection(MgSiteConnection siteConn, MgMap map) {
- try {
- map.open(mapName);
- MgResourceService resSvc = (MgResourceService)siteConn.createService(MgServiceType.ResourceService);
- MgLayerCollection items = map.getLayers();
- items.clear();
- MgResourceIdentifier ldfId = new MgResourceIdentifier("Library://Samples/Sheboygan/Layers/Parcels.LayerDefinition");
- MgLayerBase item1 = new MgLayer(ldfId, resSvc);
- item1.setName("Item1");
- MgLayerBase item2 = new MgLayer(ldfId, resSvc);
- item2.setName("Item2");
- MgLayerBase item3 = new MgLayer(ldfId, resSvc);
- item3.setName("Item3");
- MgLayerBase item4 = new MgLayer(ldfId, resSvc);
- item4.setName("Item4");
-
- //Items inserted the MapGuide API way
- items.addItem(item1);
- items.addItem(item2);
- items.addItem(item3);
-
- assertCondition(items.getCount() == 3, "Expected 3 items");
- assertCondition(!items.isEmpty(), "Expected non-empty item collection");
-
- int i = 0;
- //Looping the classic way
- for (i = 0; i < items.getCount(); i++) {
- switch (i){
- case 0:
- assertCondition(items.getItem(i).getName().equals("Item1"), "Expected item #" + (i+1) + " to be Item1");
- break;
- case 1:
- assertCondition(items.getItem(i).getName().equals("Item2"), "Expected item #" + (i+1) + " to be Item2");
- break;
- case 2:
- assertCondition(items.getItem(i).getName().equals("Item3"), "Expected item #" + (i+1) + " to be Item3");
- break;
- }
- }
-
- //Looping the iterative way
- i = 0;
- for (MgLayerBase item : items) {
- String itemName = item.getName();
- switch (i){
- case 0:
- assertCondition(itemName.equals("Item1"), "Expected item #" + (i+1) + " to be Item1");
- break;
- case 1:
- assertCondition(itemName.equals("Item2"), "Expected item #" + (i+1) + " to be Item2");
- break;
- case 2:
- assertCondition(itemName.equals("Item3"), "Expected item #" + (i+1) + " to be Item3");
- break;
- }
- i++;
- }
-
- items.clear();
- assertCondition(items.getCount() == 0, "Expected empty item collection");
- assertCondition(items.isEmpty(), "Expected empty item collection");
-
- //Now test through java.util.Collection facade
- Collection<MgLayerBase> facade = items;
- //add()
- assertCondition(facade.add(item1), "Could not add item1 the java.util.Collection way");
- assertCondition(facade.add(item2), "Could not add item2 the java.util.Collection way");
- assertCondition(facade.add(item3), "Could not add item3 the java.util.Collection way");
-
- assertCondition(facade.size() == 3, "Expected 3 items");
- assertCondition(!facade.isEmpty(), "Expected non-empty item collection");
-
- //contains()
- assertCondition(facade.contains(item1), "item1 should exist");
- assertCondition(facade.contains(item2), "item2 should exist");
- assertCondition(facade.contains(item3), "item3 should exist");
-
- ArrayList<MgLayerBase> testCollection = new ArrayList<MgLayerBase>();
- testCollection.add(item1);
- testCollection.add(item2);
- testCollection.add(item3);
-
- //containsAll()
- assertCondition(facade.containsAll(testCollection), "All items in test collection should match");
- testCollection.clear();
- testCollection.add(item1);
- testCollection.add(item4);
- assertCondition(!facade.containsAll(testCollection), "Should not have matched test collection");
-
- facade.clear();
- assertCondition(facade.size() == 0, "Expected 0 items");
- assertCondition(facade.isEmpty(), "Expected empty item collection");
-
- //addAll()
- testCollection.clear();
- testCollection.add(item1);
- testCollection.add(item2);
- testCollection.add(item3);
- assertCondition(facade.addAll(testCollection), "Expected addAll() success");
- assertCondition(facade.size() == 3, "Expected 3 items");
- assertCondition(!facade.isEmpty(), "Expected non-empty item collection");
-
- //remove()
- assertCondition(!facade.remove(item4), "Expected remove() of non-existent item to return false");
- assertCondition(!facade.remove(new MgFeatureSchema()), "Expected remove() of different type to return false");
- assertCondition(facade.remove(item2), "Expected remove() of item2 to return true");
-
- //removeAll()
- testCollection.remove(item2);
- assertCondition(facade.removeAll(testCollection), "Expected removeAll() to succeed");
-
- //retainAll()
- assertCondition(facade.add(item1), "Could not add item1 the java.util.Collection way");
- assertCondition(facade.add(item2), "Could not add item2 the java.util.Collection way");
- assertCondition(facade.add(item3), "Could not add item3 the java.util.Collection way");
- assertCondition(facade.size() == 3, "Expected 3 schemas");
- assertCondition(!facade.isEmpty(), "Expected non-empty schema collection");
-
- testCollection.clear();
- testCollection.add(item1);
- testCollection.add(item3);
- assertCondition(facade.retainAll(testCollection), "Expected retainAll() to succeed");
- assertCondition(facade.contains(item1), "Expected item1 to exist");
- assertCondition(!facade.contains(item2), "Expected item2 to not exist");
- assertCondition(facade.contains(item3), "Expected item3 to exist");
-
- //toArray()
- Object[] itemArray = facade.toArray();
- assertCondition(itemArray != null, "Expected non-null item array");
- assertCondition(itemArray.length == 2, "Expected 2 item array");
- for (Object o : itemArray) {
- assertCondition(o instanceof MgLayerBase, "Expected item to be MgLayerBase");
- }
- MgLayerBase[] fitems = facade.toArray(new MgLayerBase[0]);
- assertCondition(fitems != null, "Expected non-null item array");
- assertCondition(fitems.length == 2, "Expected 2 item array");
-
- fitems = facade.toArray(new MgLayerBase[1]);
- assertCondition(fitems != null, "Expected non-null item array");
- assertCondition(fitems.length == 2, "Expected 2 item array");
-
- fitems = facade.toArray(new MgLayerBase[3]);
- assertCondition(fitems != null, "Expected non-null item array");
- assertCondition(fitems.length == 3, "Expected 3 item array");
- assertCondition(fitems[0] != null, "Expected non-null item #1");
- assertCondition(fitems[1] != null, "Expected non-null item #2");
- assertCondition(fitems[2] == null, "Expected null item #3");
-
- return true;
- }
- catch (MgException ex) {
- assertCondition(false, ex.getMessage());
- }
- catch (AssertException ex) {
- assertFailures.add(ex);
- }
- return false;
- }
-
- private static boolean testLayerGroupCollection(MgSiteConnection siteConn, MgMap map) {
- try {
- map.open(mapName);
- MgResourceService resSvc = (MgResourceService)siteConn.createService(MgServiceType.ResourceService);
- MgLayerGroupCollection items = map.getLayerGroups();
- items.clear();
- MgResourceIdentifier ldfId = new MgResourceIdentifier("Library://Samples/Sheboygan/Layers/Parcels.LayerDefinition");
- MgLayerGroup item1 = new MgLayerGroup("Item1");
- MgLayerGroup item2 = new MgLayerGroup("Item2");
- MgLayerGroup item3 = new MgLayerGroup("Item3");
- MgLayerGroup item4 = new MgLayerGroup("Item4");
-
- //Items inserted the MapGuide API way
- items.addItem(item1);
- items.addItem(item2);
- items.addItem(item3);
-
- assertCondition(items.getCount() == 3, "Expected 3 items");
- assertCondition(!items.isEmpty(), "Expected non-empty item collection");
-
- int i = 0;
- //Looping the classic way
- for (i = 0; i < items.getCount(); i++) {
- switch (i){
- case 0:
- assertCondition(items.getItem(i).getName().equals("Item1"), "Expected item #" + (i+1) + " to be Item1");
- break;
- case 1:
- assertCondition(items.getItem(i).getName().equals("Item2"), "Expected item #" + (i+1) + " to be Item2");
- break;
- case 2:
- assertCondition(items.getItem(i).getName().equals("Item3"), "Expected item #" + (i+1) + " to be Item3");
- break;
- }
- }
-
- //Looping the iterative way
- i = 0;
- for (MgLayerGroup item : items) {
- String itemName = item.getName();
- switch (i){
- case 0:
- assertCondition(itemName.equals("Item1"), "Expected item #" + (i+1) + " to be Item1");
- break;
- case 1:
- assertCondition(itemName.equals("Item2"), "Expected item #" + (i+1) + " to be Item2");
- break;
- case 2:
- assertCondition(itemName.equals("Item3"), "Expected item #" + (i+1) + " to be Item3");
- break;
- }
- i++;
- }
-
- items.clear();
- assertCondition(items.getCount() == 0, "Expected empty item collection");
- assertCondition(items.isEmpty(), "Expected empty item collection");
-
- //Now test through java.util.Collection facade
- Collection<MgLayerGroup> facade = items;
- //add()
- assertCondition(facade.add(item1), "Could not add item1 the java.util.Collection way");
- assertCondition(facade.add(item2), "Could not add item2 the java.util.Collection way");
- assertCondition(facade.add(item3), "Could not add item3 the java.util.Collection way");
-
- assertCondition(facade.size() == 3, "Expected 3 items");
- assertCondition(!facade.isEmpty(), "Expected non-empty item collection");
-
- //contains()
- assertCondition(facade.contains(item1), "item1 should exist");
- assertCondition(facade.contains(item2), "item2 should exist");
- assertCondition(facade.contains(item3), "item3 should exist");
-
- ArrayList<MgLayerGroup> testCollection = new ArrayList<MgLayerGroup>();
- testCollection.add(item1);
- testCollection.add(item2);
- testCollection.add(item3);
-
- //containsAll()
- assertCondition(facade.containsAll(testCollection), "All items in test collection should match");
- testCollection.clear();
- testCollection.add(item1);
- testCollection.add(item4);
- assertCondition(!facade.containsAll(testCollection), "Should not have matched test collection");
-
- facade.clear();
- assertCondition(facade.size() == 0, "Expected 0 items");
- assertCondition(facade.isEmpty(), "Expected empty item collection");
-
- //addAll()
- testCollection.clear();
- testCollection.add(item1);
- testCollection.add(item2);
- testCollection.add(item3);
- assertCondition(facade.addAll(testCollection), "Expected addAll() success");
- assertCondition(facade.size() == 3, "Expected 3 items");
- assertCondition(!facade.isEmpty(), "Expected non-empty item collection");
-
- //remove()
- assertCondition(!facade.remove(item4), "Expected remove() of non-existent item to return false");
- assertCondition(!facade.remove(new MgFeatureSchema()), "Expected remove() of different type to return false");
- assertCondition(facade.remove(item2), "Expected remove() of item2 to return true");
-
- //removeAll()
- testCollection.remove(item2);
- assertCondition(facade.removeAll(testCollection), "Expected removeAll() to succeed");
-
- //retainAll()
- assertCondition(facade.add(item1), "Could not add item1 the java.util.Collection way");
- assertCondition(facade.add(item2), "Could not add item2 the java.util.Collection way");
- assertCondition(facade.add(item3), "Could not add item3 the java.util.Collection way");
- assertCondition(facade.size() == 3, "Expected 3 schemas");
- assertCondition(!facade.isEmpty(), "Expected non-empty schema collection");
-
- testCollection.clear();
- testCollection.add(item1);
- testCollection.add(item3);
- assertCondition(facade.retainAll(testCollection), "Expected retainAll() to succeed");
- assertCondition(facade.contains(item1), "Expected item1 to exist");
- assertCondition(!facade.contains(item2), "Expected item2 to not exist");
- assertCondition(facade.contains(item3), "Expected item3 to exist");
-
- //toArray()
- Object[] itemArray = facade.toArray();
- assertCondition(itemArray != null, "Expected non-null item array");
- assertCondition(itemArray.length == 2, "Expected 2 item array");
- for (Object o : itemArray) {
- assertCondition(o instanceof MgLayerGroup, "Expected item to be MgLayerBase");
- }
- MgLayerGroup[] fitems = facade.toArray(new MgLayerGroup[0]);
- assertCondition(fitems != null, "Expected non-null item array");
- assertCondition(fitems.length == 2, "Expected 2 item array");
-
- fitems = facade.toArray(new MgLayerGroup[1]);
- assertCondition(fitems != null, "Expected non-null item array");
- assertCondition(fitems.length == 2, "Expected 2 item array");
-
- fitems = facade.toArray(new MgLayerGroup[3]);
- assertCondition(fitems != null, "Expected non-null item array");
- assertCondition(fitems.length == 3, "Expected 3 item array");
- assertCondition(fitems[0] != null, "Expected non-null item #1");
- assertCondition(fitems[1] != null, "Expected non-null item #2");
- assertCondition(fitems[2] == null, "Expected null item #3");
-
- return true;
- }
- catch (MgException ex) {
- assertCondition(false, ex.getMessage());
- }
- catch (AssertException ex) {
- assertFailures.add(ex);
- }
- return false;
- }
-}
Copied: trunk/MgDev/UnitTest/Common/JavaApiExTest/src/MapGuideApiTest.java (from rev 7251, sandbox/jng/swig-java/UnitTest/Common/JavaApiExTest/src/MapGuideApiTest.java)
===================================================================
--- trunk/MgDev/UnitTest/Common/JavaApiExTest/src/MapGuideApiTest.java (rev 0)
+++ trunk/MgDev/UnitTest/Common/JavaApiExTest/src/MapGuideApiTest.java 2013-01-12 03:36:03 UTC (rev 7297)
@@ -0,0 +1,1245 @@
+/**
+ * Created with IntelliJ IDEA.
+ * User: Jackie Ng
+ * Date: 26/11/12
+ * Time: 11:37 PM
+ * To change this template use File | Settings | File Templates.
+ */
+import org.osgeo.mapguide.*;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * This test harness is to exercise the java.util.Collection implementation of the MapGuide proxy classes that implement it
+ * and the common usage scenarios involving them
+ */
+public class MapGuideApiTest {
+
+ static List<AssertException> assertFailures;
+ static String sessionId;
+ static String mapName;
+
+ public static void main(String [] args) {
+ assertFailures = new ArrayList<AssertException>();
+ if (args.length == 1) {
+ MapGuideJavaApiEx.MgInitializeWebTier(args[0]);
+ } else {
+ if (System.getProperty("os.name").startsWith("Windows")) {
+ MapGuideJavaApiEx.MgInitializeWebTier("C:\\Program Files\\OSGeo\\MapGuide\\Web\\www\\webconfig.ini");
+ } else {
+ MapGuideJavaApiEx.MgInitializeWebTier("/usr/local/mapguideopensource/webserverextensions/www/webconfig.ini");
+ }
+ }
+
+ MgUserInformation userInfo = new MgUserInformation("Administrator", "admin");
+ MgSiteConnection siteConn = new MgSiteConnection();
+ siteConn.open(userInfo);
+
+ MgSite site = siteConn.getSite();
+ sessionId = site.createSession();
+ userInfo.setMgSessionId(sessionId);
+
+ MgMap map = new MgMap(siteConn);
+ MgResourceService resSvc = (MgResourceService)siteConn.createService(MgServiceType.ResourceService);
+ MgResourceIdentifier mdfId = new MgResourceIdentifier("Library://Samples/Sheboygan/Maps/Sheboygan.MapDefinition");
+ mapName = mdfId.getName();
+ map.create(mdfId, mapName);
+
+ MgSelection sel = new MgSelection(map);
+ sel.save(resSvc, mapName);
+
+ MgResourceIdentifier mapStateId = new MgResourceIdentifier("Session:" + sessionId + "//" + mapName + "." + MgResourceType.Map);
+ map.save(resSvc, mapStateId);
+
+ System.out.println("Running tests");
+ runTests(siteConn, map);
+ System.exit(assertFailures.size());
+ }
+
+ private static void assertCondition(boolean condition, String failureMsg) {
+ if (!condition)
+ throw new AssertException(failureMsg);
+ }
+
+ private static void runTests(MgSiteConnection siteConn, MgMap map) {
+ System.out.print(testFeatureSchemaCollection() ? "." : "F");
+ System.out.print(testClassDefinitionCollection() ? "." : "F");
+ System.out.print(testPropertyDefinitionCollection() ? "." : "F");
+ System.out.print(testPropertyCollection() ? "." : "F");
+ System.out.print(testStringCollection() ? "." : "F");
+ System.out.print(testReadOnlyLayerCollection(siteConn, map) ? "." : "F");
+ System.out.print(testLayerCollection(siteConn, map) ? "." : "F");
+ System.out.print(testLayerGroupCollection(siteConn, map) ? "." : "F");
+ System.out.println();
+ if (assertFailures.size() > 0) {
+ int i = 1;
+ for (AssertException ex : assertFailures) {
+ System.out.println("Assertion Failure: " + i);
+ ex.printStackTrace(System.out);
+ i++;
+ }
+ }
+ }
+
+ private static boolean testReadOnlyLayerCollection(MgSiteConnection siteConn, MgMap map) {
+ try {
+
+ MgFeatureQueryOptions query1 = new MgFeatureQueryOptions();
+ query1.setFilter("Autogenerated_SDF_ID < 4");
+
+ MgFeatureQueryOptions query2 = new MgFeatureQueryOptions();
+ query2.setFilter("Autogenerated_SDF_ID < 4");
+
+ MgLayerCollection layers = map.getLayers();
+ MgLayerBase item1 = layers.getItem("Parcels");
+ MgLayerBase item2 = layers.getItem("Buildings");
+
+ MgFeatureReader fr1 = item1.selectFeatures(query1);
+ MgFeatureReader fr2 = item2.selectFeatures(query2);
+
+ MgResourceService resSvc = (MgResourceService)siteConn.createService(MgServiceType.ResourceService);
+ MgSelection sel = new MgSelection(map);
+ sel.open(resSvc, map.getName());
+ sel.fromXml(""); //Clear
+ try {
+ sel.addFeatures(item1, fr1, 0);
+ sel.addFeatures(item2, fr2, 0);
+ } finally{
+ fr1.close();
+ fr2.close();
+ }
+
+ sel.save(resSvc);
+
+ //Now we can test the collection
+ MgReadOnlyLayerCollection items = sel.getLayers();
+
+ assertCondition(items.getCount() == 2, "Expected 2 items");
+
+ //NOTE: Possible bug in ordering of MgReadOnlyLayerCollection here (I had to reverse the order of layers
+ //being tested) Nevertheless, were testing that the ordering (whether correct or not) is the same when iterated
+ //in both the classical and iterative methods
+
+ int i = 0;
+ //Looping the classic way
+ for (i = 0; i < items.getCount(); i++) {
+ switch (i){
+ case 0:
+ assertCondition(items.getItem(i).getName().equals("Buildings"), "Expected item #" + (i+1) + " to be Buildings");
+ break;
+ case 1:
+ assertCondition(items.getItem(i).getName().equals("Parcels"), "Expected item #" + (i+1) + " to be Parcels");
+ break;
+ }
+ }
+
+ //Looping the iterative way
+ i = 0;
+ for (MgLayerBase item : items) {
+ String itemName = item.getName();
+ switch (i){
+ case 0:
+ assertCondition(itemName.equals("Buildings"), "Expected item #" + (i+1) + " to be Buildings");
+ break;
+ case 1:
+ assertCondition(itemName.equals("Parcels"), "Expected item #" + (i+1) + " to be Parcels");
+ break;
+ }
+ i++;
+ }
+ return true;
+ }
+ catch (MgException ex) {
+ assertCondition(false, ex.getMessage());
+ }
+ catch (AssertException ex) {
+ assertFailures.add(ex);
+ }
+ return false;
+ }
+
+ private static boolean testStringCollection() {
+ try {
+ MgStringCollection items = new MgStringCollection();
+ String item1 = "Item1";
+ String item2 = "Item2";
+ String item3 = "Item3";
+ String item4 = "Item4";
+
+ //Items inserted the MapGuide API way
+ items.addItem(item1);
+ items.addItem(item2);
+ items.addItem(item3);
+
+ assertCondition(items.getCount() == 3, "Expected 3 items");
+ assertCondition(!items.isEmpty(), "Expected non-empty item collection");
+
+ int i = 0;
+ //Looping the classic way
+ for (i = 0; i < items.getCount(); i++) {
+ switch (i){
+ case 0:
+ assertCondition(items.getItem(i).equals("Item1"), "Expected item #" + (i+1) + " to be Item1");
+ break;
+ case 1:
+ assertCondition(items.getItem(i).equals("Item2"), "Expected item #" + (i+1) + " to be Item2");
+ break;
+ case 2:
+ assertCondition(items.getItem(i).equals("Item3"), "Expected item #" + (i+1) + " to be Item3");
+ break;
+ }
+ }
+
+ //Looping the iterative way
+ i = 0;
+ for (String item : items) {
+ String itemName = item;
+ switch (i){
+ case 0:
+ assertCondition(itemName.equals("Item1"), "Expected item #" + (i+1) + " to be Item1");
+ break;
+ case 1:
+ assertCondition(itemName.equals("Item2"), "Expected item #" + (i+1) + " to be Item2");
+ break;
+ case 2:
+ assertCondition(itemName.equals("Item3"), "Expected item #" + (i+1) + " to be Item3");
+ break;
+ }
+ i++;
+ }
+
+ items.clear();
+ assertCondition(items.getCount() == 0, "Expected empty item collection");
+ assertCondition(items.isEmpty(), "Expected empty item collection");
+
+ //Now test through java.util.Collection facade
+ Collection<String> facade = items;
+ //add()
+ assertCondition(facade.add(item1), "Could not add item1 the java.util.Collection way");
+ assertCondition(facade.add(item2), "Could not add item2 the java.util.Collection way");
+ assertCondition(facade.add(item3), "Could not add item3 the java.util.Collection way");
+
+ assertCondition(facade.size() == 3, "Expected 3 items");
+ assertCondition(!facade.isEmpty(), "Expected non-empty item collection");
+
+ //contains()
+ assertCondition(facade.contains(item1), "item1 should exist");
+ assertCondition(facade.contains(item2), "item2 should exist");
+ assertCondition(facade.contains(item3), "item3 should exist");
+
+ ArrayList<String> testCollection = new ArrayList<String>();
+ testCollection.add(item1);
+ testCollection.add(item2);
+ testCollection.add(item3);
+
+ //containsAll()
+ assertCondition(facade.containsAll(testCollection), "All items in test collection should match");
+ testCollection.clear();
+ testCollection.add(item1);
+ testCollection.add(item4);
+ assertCondition(!facade.containsAll(testCollection), "Should not have matched test collection");
+
+ facade.clear();
+ assertCondition(facade.size() == 0, "Expected 0 items");
+ assertCondition(facade.isEmpty(), "Expected empty item collection");
+
+ //addAll()
+ testCollection.clear();
+ testCollection.add(item1);
+ testCollection.add(item2);
+ testCollection.add(item3);
+ assertCondition(facade.addAll(testCollection), "Expected addAll() success");
+ assertCondition(facade.size() == 3, "Expected 3 items");
+ assertCondition(!facade.isEmpty(), "Expected non-empty item collection");
+
+ //remove()
+ assertCondition(!facade.remove(item4), "Expected remove() of non-existent item to return false");
+ assertCondition(!facade.remove(new MgClassDefinition()), "Expected remove() of different type to return false");
+ assertCondition(facade.remove(item2), "Expected remove() of item2 to return true");
+
+ //removeAll()
+ testCollection.remove(item2);
+ assertCondition(facade.removeAll(testCollection), "Expected removeAll() to succeed");
+
+ //retainAll()
+ assertCondition(facade.add(item1), "Could not add item1 the java.util.Collection way");
+ assertCondition(facade.add(item2), "Could not add item2 the java.util.Collection way");
+ assertCondition(facade.add(item3), "Could not add item3 the java.util.Collection way");
+ assertCondition(facade.size() == 3, "Expected 3 schemas");
+ assertCondition(!facade.isEmpty(), "Expected non-empty schema collection");
+
+ testCollection.clear();
+ testCollection.add(item1);
+ testCollection.add(item3);
+ assertCondition(facade.retainAll(testCollection), "Expected retainAll() to succeed");
+ assertCondition(facade.contains(item1), "Expected item1 to exist");
+ assertCondition(!facade.contains(item2), "Expected item2 to not exist");
+ assertCondition(facade.contains(item3), "Expected item3 to exist");
+
+ //toArray()
+ Object[] itemArray = facade.toArray();
+ assertCondition(itemArray != null, "Expected non-null item array");
+ assertCondition(itemArray.length == 2, "Expected 2 item array");
+ for (Object o : itemArray) {
+ assertCondition(o instanceof String, "Expected item to be String");
+ }
+ String[] fitems = facade.toArray(new String[0]);
+ assertCondition(fitems != null, "Expected non-null item array");
+ assertCondition(fitems.length == 2, "Expected 2 item array");
+
+ fitems = facade.toArray(new String[1]);
+ assertCondition(fitems != null, "Expected non-null item array");
+ assertCondition(fitems.length == 2, "Expected 2 item array");
+
+ fitems = facade.toArray(new String[3]);
+ assertCondition(fitems != null, "Expected non-null item array");
+ assertCondition(fitems.length == 3, "Expected 3 item array");
+ assertCondition(fitems[0] != null, "Expected non-null item #1");
+ assertCondition(fitems[1] != null, "Expected non-null item #2");
+ assertCondition(fitems[2] == null, "Expected null item #3");
+
+ return true;
+ }
+ catch (MgException ex) {
+ assertCondition(false, ex.getMessage());
+ }
+ catch (AssertException ex) {
+ assertFailures.add(ex);
+ }
+ return false;
+ }
+
+ private static boolean testPropertyCollection() {
+ try {
+ MgPropertyCollection items = new MgPropertyCollection();
+ MgProperty item1 = new MgStringProperty("Item1", "Hello World");
+ MgProperty item2 = new MgInt32Property("Item2", 42);
+ MgProperty item3 = new MgBooleanProperty("Item3", false);
+ MgProperty item4 = new MgByteProperty("Item4", (short)4);
+
+ //Items inserted the MapGuide API way
+ items.addItem(item1);
+ items.addItem(item2);
+ items.addItem(item3);
+
+ assertCondition(items.getCount() == 3, "Expected 3 items");
+ assertCondition(!items.isEmpty(), "Expected non-empty item collection");
+
+ int i = 0;
+ //Looping the classic way
+ for (i = 0; i < items.getCount(); i++) {
+ switch (i){
+ case 0:
+ assertCondition(items.getItem(i).getName().equals("Item1"), "Expected item #" + (i+1) + " to be Item1");
+ break;
+ case 1:
+ assertCondition(items.getItem(i).getName().equals("Item2"), "Expected item #" + (i+1) + " to be Item2");
+ break;
+ case 2:
+ assertCondition(items.getItem(i).getName().equals("Item3"), "Expected item #" + (i+1) + " to be Item3");
+ break;
+ }
+ }
+
+ //Looping the iterative way
+ i = 0;
+ for (MgProperty item : items) {
+ String itemName = item.getName();
+ switch (i){
+ case 0:
+ assertCondition(itemName.equals("Item1"), "Expected item #" + (i+1) + " to be Item1");
+ break;
+ case 1:
+ assertCondition(itemName.equals("Item2"), "Expected item #" + (i+1) + " to be Item2");
+ break;
+ case 2:
+ assertCondition(itemName.equals("Item3"), "Expected item #" + (i+1) + " to be Item3");
+ break;
+ }
+ i++;
+ }
+
+ items.clear();
+ assertCondition(items.getCount() == 0, "Expected empty item collection");
+ assertCondition(items.isEmpty(), "Expected empty item collection");
+
+ //Now test through java.util.Collection facade
+ Collection<MgProperty> facade = items;
+ //add()
+ assertCondition(facade.add(item1), "Could not add item1 the java.util.Collection way");
+ assertCondition(facade.add(item2), "Could not add item2 the java.util.Collection way");
+ assertCondition(facade.add(item3), "Could not add item3 the java.util.Collection way");
+
+ assertCondition(facade.size() == 3, "Expected 3 items");
+ assertCondition(!facade.isEmpty(), "Expected non-empty item collection");
+
+ //contains()
+ assertCondition(facade.contains(item1), "item1 should exist");
+ assertCondition(facade.contains(item2), "item2 should exist");
+ assertCondition(facade.contains(item3), "item3 should exist");
+
+ ArrayList<MgProperty> testCollection = new ArrayList<MgProperty>();
+ testCollection.add(item1);
+ testCollection.add(item2);
+ testCollection.add(item3);
+
+ //containsAll()
+ assertCondition(facade.containsAll(testCollection), "All items in test collection should match");
+ testCollection.clear();
+ testCollection.add(item1);
+ testCollection.add(item4);
+ assertCondition(!facade.containsAll(testCollection), "Should not have matched test collection");
+
+ facade.clear();
+ assertCondition(facade.size() == 0, "Expected 0 items");
+ assertCondition(facade.isEmpty(), "Expected empty item collection");
+
+ //addAll()
+ testCollection.clear();
+ testCollection.add(item1);
+ testCollection.add(item2);
+ testCollection.add(item3);
+ assertCondition(facade.addAll(testCollection), "Expected addAll() success");
+ assertCondition(facade.size() == 3, "Expected 3 items");
+ assertCondition(!facade.isEmpty(), "Expected non-empty item collection");
+
+ //remove()
+ assertCondition(!facade.remove(item4), "Expected remove() of non-existent item to return false");
+ assertCondition(!facade.remove(new MgClassDefinition()), "Expected remove() of different type to return false");
+ assertCondition(facade.remove(item2), "Expected remove() of item2 to return true");
+
+ //removeAll()
+ testCollection.remove(item2);
+ assertCondition(facade.removeAll(testCollection), "Expected removeAll() to succeed");
+
+ //retainAll()
+ assertCondition(facade.add(item1), "Could not add item1 the java.util.Collection way");
+ assertCondition(facade.add(item2), "Could not add item2 the java.util.Collection way");
+ assertCondition(facade.add(item3), "Could not add item3 the java.util.Collection way");
+ assertCondition(facade.size() == 3, "Expected 3 schemas");
+ assertCondition(!facade.isEmpty(), "Expected non-empty schema collection");
+
+ testCollection.clear();
+ testCollection.add(item1);
+ testCollection.add(item3);
+ assertCondition(facade.retainAll(testCollection), "Expected retainAll() to succeed");
+ assertCondition(facade.contains(item1), "Expected item1 to exist");
+ assertCondition(!facade.contains(item2), "Expected item2 to not exist");
+ assertCondition(facade.contains(item3), "Expected item3 to exist");
+
+ //toArray()
+ Object[] itemArray = facade.toArray();
+ assertCondition(itemArray != null, "Expected non-null item array");
+ assertCondition(itemArray.length == 2, "Expected 2 item array");
+ i = 0;
+ for (Object o : itemArray) {
+ assertCondition(o instanceof MgProperty, "Expected item to be MgProperty");
+ switch(i) {
+ case 0:
+ assertCondition(o instanceof MgStringProperty, "Expected item to be MgStringProperty");
+ break;
+ case 1:
+ assertCondition(o instanceof MgBooleanProperty, "Expected item to be MgBooleanProperty");
+ break;
+ }
+ i++;
+ }
+
+ MgProperty[] fitems = facade.toArray(new MgProperty[0]);
+ assertCondition(fitems != null, "Expected non-null item array");
+ assertCondition(fitems.length == 2, "Expected 2 item array");
+
+ fitems = facade.toArray(new MgProperty[1]);
+ assertCondition(fitems != null, "Expected non-null item array");
+ assertCondition(fitems.length == 2, "Expected 2 item array");
+
+ fitems = facade.toArray(new MgProperty[3]);
+ assertCondition(fitems != null, "Expected non-null item array");
+ assertCondition(fitems.length == 3, "Expected 3 item array");
+ assertCondition(fitems[0] != null, "Expected non-null item #1");
+ assertCondition(fitems[1] != null, "Expected non-null item #2");
+ assertCondition(fitems[2] == null, "Expected null item #3");
+
+ return true;
+ }
+ catch (MgException ex) {
+ assertCondition(false, ex.getMessage());
+ }
+ catch (AssertException ex) {
+ assertFailures.add(ex);
+ }
+ return false;
+ }
+
+ private static boolean testClassDefinitionCollection() {
+ try {
+ MgFeatureSchema parent = new MgFeatureSchema("Parent", "");
+ MgClassDefinitionCollection items = parent.getClasses();
+ MgClassDefinition item1 = new MgClassDefinition(); item1.setName("Item1");
+ MgClassDefinition item2 = new MgClassDefinition(); item2.setName("Item2");
+ MgClassDefinition item3 = new MgClassDefinition(); item3.setName("Item3");
+ MgClassDefinition item4 = new MgClassDefinition(); item4.setName("Item4");
+
+ //Items inserted the MapGuide API way
+ items.addItem(item1);
+ items.addItem(item2);
+ items.addItem(item3);
+
+ assertCondition(items.getCount() == 3, "Expected 3 items");
+ assertCondition(!items.isEmpty(), "Expected non-empty item collection");
+
+ int i = 0;
+ //Looping the classic way
+ for (i = 0; i < items.getCount(); i++) {
+ switch (i){
+ case 0:
+ assertCondition(items.getItem(i).getName().equals("Item1"), "Expected item #" + (i+1) + " to be Item1");
+ break;
+ case 1:
+ assertCondition(items.getItem(i).getName().equals("Item2"), "Expected item #" + (i+1) + " to be Item2");
+ break;
+ case 2:
+ assertCondition(items.getItem(i).getName().equals("Item3"), "Expected item #" + (i+1) + " to be Item3");
+ break;
+ }
+ }
+
+ //Looping the iterative way
+ i = 0;
+ for (MgClassDefinition item : items) {
+ String itemName = item.getName();
+ switch (i){
+ case 0:
+ assertCondition(itemName.equals("Item1"), "Expected item #" + (i+1) + " to be Item1");
+ break;
+ case 1:
+ assertCondition(itemName.equals("Item2"), "Expected item #" + (i+1) + " to be Item2");
+ break;
+ case 2:
+ assertCondition(itemName.equals("Item3"), "Expected item #" + (i+1) + " to be Item3");
+ break;
+ }
+ i++;
+ }
+
+ items.clear();
+ assertCondition(items.getCount() == 0, "Expected empty item collection");
+ assertCondition(items.isEmpty(), "Expected empty item collection");
+
+ //Now test through java.util.Collection facade
+ Collection<MgClassDefinition> facade = items;
+ //add()
+ assertCondition(facade.add(item1), "Could not add item1 the java.util.Collection way");
+ assertCondition(facade.add(item2), "Could not add item2 the java.util.Collection way");
+ assertCondition(facade.add(item3), "Could not add item3 the java.util.Collection way");
+
+ assertCondition(facade.size() == 3, "Expected 3 items");
+ assertCondition(!facade.isEmpty(), "Expected non-empty item collection");
+
+ //contains()
+ assertCondition(facade.contains(item1), "item1 should exist");
+ assertCondition(facade.contains(item2), "item2 should exist");
+ assertCondition(facade.contains(item3), "item3 should exist");
+
+ ArrayList<MgClassDefinition> testCollection = new ArrayList<MgClassDefinition>();
+ testCollection.add(item1);
+ testCollection.add(item2);
+ testCollection.add(item3);
+
+ //containsAll()
+ assertCondition(facade.containsAll(testCollection), "All items in test collection should match");
+ testCollection.clear();
+ testCollection.add(item1);
+ testCollection.add(item4);
+ assertCondition(!facade.containsAll(testCollection), "Should not have matched test collection");
+
+ facade.clear();
+ assertCondition(facade.size() == 0, "Expected 0 items");
+ assertCondition(facade.isEmpty(), "Expected empty item collection");
+
+ //addAll()
+ testCollection.clear();
+ testCollection.add(item1);
+ testCollection.add(item2);
+ testCollection.add(item3);
+ assertCondition(facade.addAll(testCollection), "Expected addAll() success");
+ assertCondition(facade.size() == 3, "Expected 3 items");
+ assertCondition(!facade.isEmpty(), "Expected non-empty item collection");
+
+ //remove()
+ assertCondition(!facade.remove(item4), "Expected remove() of non-existent item to return false");
+ assertCondition(!facade.remove(new MgFeatureSchema()), "Expected remove() of different type to return false");
+ assertCondition(facade.remove(item2), "Expected remove() of item2 to return true");
+
+ //removeAll()
+ testCollection.remove(item2);
+ assertCondition(facade.removeAll(testCollection), "Expected removeAll() to succeed");
+
+ //retainAll()
+ assertCondition(facade.add(item1), "Could not add item1 the java.util.Collection way");
+ assertCondition(facade.add(item2), "Could not add item2 the java.util.Collection way");
+ assertCondition(facade.add(item3), "Could not add item3 the java.util.Collection way");
+ assertCondition(facade.size() == 3, "Expected 3 schemas");
+ assertCondition(!facade.isEmpty(), "Expected non-empty schema collection");
+
+ testCollection.clear();
+ testCollection.add(item1);
+ testCollection.add(item3);
+ assertCondition(facade.retainAll(testCollection), "Expected retainAll() to succeed");
+ assertCondition(facade.contains(item1), "Expected item1 to exist");
+ assertCondition(!facade.contains(item2), "Expected item2 to not exist");
+ assertCondition(facade.contains(item3), "Expected item3 to exist");
+
+ //toArray()
+ Object[] itemArray = facade.toArray();
+ assertCondition(itemArray != null, "Expected non-null item array");
+ assertCondition(itemArray.length == 2, "Expected 2 item array");
+ for (Object o : itemArray) {
+ assertCondition(o instanceof MgClassDefinition, "Expected item to be MgClassDefinition");
+ }
+ MgClassDefinition[] fitems = facade.toArray(new MgClassDefinition[0]);
+ assertCondition(fitems != null, "Expected non-null item array");
+ assertCondition(fitems.length == 2, "Expected 2 item array");
+
+ fitems = facade.toArray(new MgClassDefinition[1]);
+ assertCondition(fitems != null, "Expected non-null item array");
+ assertCondition(fitems.length == 2, "Expected 2 item array");
+
+ fitems = facade.toArray(new MgClassDefinition[3]);
+ assertCondition(fitems != null, "Expected non-null item array");
+ assertCondition(fitems.length == 3, "Expected 3 item array");
+ assertCondition(fitems[0] != null, "Expected non-null item #1");
+ assertCondition(fitems[1] != null, "Expected non-null item #2");
+ assertCondition(fitems[2] == null, "Expected null item #3");
+
+ return true;
+ }
+ catch (MgException ex) {
+ assertCondition(false, ex.getMessage());
+ }
+ catch (AssertException ex) {
+ assertFailures.add(ex);
+ }
+ return false;
+ }
+
+ private static boolean testFeatureSchemaCollection() {
+ try {
+ MgFeatureSchemaCollection items = new MgFeatureSchemaCollection();
+ MgFeatureSchema item1 = new MgFeatureSchema("Item1", "");
+ MgFeatureSchema item2 = new MgFeatureSchema("Item2", "");
+ MgFeatureSchema item3 = new MgFeatureSchema("Item3", "");
+ MgFeatureSchema item4 = new MgFeatureSchema("Item4", "");
+
+ //Items inserted the MapGuide API way
+ items.addItem(item1);
+ items.addItem(item2);
+ items.addItem(item3);
+
+ assertCondition(items.getCount() == 3, "Expected 3 items");
+ assertCondition(!items.isEmpty(), "Expected non-empty item collection");
+
+ int i = 0;
+ //Looping the classic way
+ for (i = 0; i < items.getCount(); i++) {
+ switch (i){
+ case 0:
+ assertCondition(items.getItem(i).getName().equals("Item1"), "Expected item #" + (i+1) + " to be Item1");
+ break;
+ case 1:
+ assertCondition(items.getItem(i).getName().equals("Item2"), "Expected item #" + (i+1) + " to be Item2");
+ break;
+ case 2:
+ assertCondition(items.getItem(i).getName().equals("Item3"), "Expected item #" + (i+1) + " to be Item3");
+ break;
+ }
+ }
+
+ //Looping the iterative way
+ i = 0;
+ for (MgFeatureSchema item : items) {
+ String itemName = item.getName();
+ switch (i){
+ case 0:
+ assertCondition(itemName.equals("Item1"), "Expected item #" + (i+1) + " to be Item1");
+ break;
+ case 1:
+ assertCondition(itemName.equals("Item2"), "Expected item #" + (i+1) + " to be Item2");
+ break;
+ case 2:
+ assertCondition(itemName.equals("Item3"), "Expected item #" + (i+1) + " to be Item3");
+ break;
+ }
+ i++;
+ }
+
+ items.clear();
+ assertCondition(items.getCount() == 0, "Expected empty item collection");
+ assertCondition(items.isEmpty(), "Expected empty item collection");
+
+ //Now test through java.util.Collection facade
+ Collection<MgFeatureSchema> facade = items;
+ //add()
+ assertCondition(facade.add(item1), "Could not add item1 the java.util.Collection way");
+ assertCondition(facade.add(item2), "Could not add item2 the java.util.Collection way");
+ assertCondition(facade.add(item3), "Could not add item3 the java.util.Collection way");
+
+ assertCondition(facade.size() == 3, "Expected 3 items");
+ assertCondition(!facade.isEmpty(), "Expected non-empty item collection");
+
+ //contains()
+ assertCondition(facade.contains(item1), "item1 should exist");
+ assertCondition(facade.contains(item2), "item2 should exist");
+ assertCondition(facade.contains(item3), "item3 should exist");
+
+ ArrayList<MgFeatureSchema> testCollection = new ArrayList<MgFeatureSchema>();
+ testCollection.add(item1);
+ testCollection.add(item2);
+ testCollection.add(item3);
+
+ //containsAll()
+ assertCondition(facade.containsAll(testCollection), "All items in test collection should match");
+ testCollection.clear();
+ testCollection.add(item1);
+ testCollection.add(item4);
+ assertCondition(!facade.containsAll(testCollection), "Should not have matched test collection");
+
+ facade.clear();
+ assertCondition(facade.size() == 0, "Expected 0 items");
+ assertCondition(facade.isEmpty(), "Expected empty item collection");
+
+ //addAll()
+ testCollection.clear();
+ testCollection.add(item1);
+ testCollection.add(item2);
+ testCollection.add(item3);
+ assertCondition(facade.addAll(testCollection), "Expected addAll() success");
+ assertCondition(facade.size() == 3, "Expected 3 items");
+ assertCondition(!facade.isEmpty(), "Expected non-empty item collection");
+
+ //remove()
+ assertCondition(!facade.remove(item4), "Expected remove() of non-existent item to return false");
+ assertCondition(!facade.remove(new MgClassDefinition()), "Expected remove() of different type to return false");
+ assertCondition(facade.remove(item2), "Expected remove() of item2 to return true");
+
+ //removeAll()
+ testCollection.remove(item2);
+ assertCondition(facade.removeAll(testCollection), "Expected removeAll() to succeed");
+
+ //retainAll()
+ assertCondition(facade.add(item1), "Could not add item1 the java.util.Collection way");
+ assertCondition(facade.add(item2), "Could not add item2 the java.util.Collection way");
+ assertCondition(facade.add(item3), "Could not add item3 the java.util.Collection way");
+ assertCondition(facade.size() == 3, "Expected 3 schemas");
+ assertCondition(!facade.isEmpty(), "Expected non-empty schema collection");
+
+ testCollection.clear();
+ testCollection.add(item1);
+ testCollection.add(item3);
+ assertCondition(facade.retainAll(testCollection), "Expected retainAll() to succeed");
+ assertCondition(facade.contains(item1), "Expected item1 to exist");
+ assertCondition(!facade.contains(item2), "Expected item2 to not exist");
+ assertCondition(facade.contains(item3), "Expected item3 to exist");
+
+ //toArray()
+ Object[] itemArray = facade.toArray();
+ assertCondition(itemArray != null, "Expected non-null item array");
+ assertCondition(itemArray.length == 2, "Expected 2 item array");
+ for (Object o : itemArray) {
+ assertCondition(o instanceof MgFeatureSchema, "Expected item to be MgFeatureSchema");
+ }
+ MgFeatureSchema[] fitems = facade.toArray(new MgFeatureSchema[0]);
+ assertCondition(fitems != null, "Expected non-null item array");
+ assertCondition(fitems.length == 2, "Expected 2 item array");
+
+ fitems = facade.toArray(new MgFeatureSchema[1]);
+ assertCondition(fitems != null, "Expected non-null item array");
+ assertCondition(fitems.length == 2, "Expected 2 item array");
+
+ fitems = facade.toArray(new MgFeatureSchema[3]);
+ assertCondition(fitems != null, "Expected non-null item array");
+ assertCondition(fitems.length == 3, "Expected 3 item array");
+ assertCondition(fitems[0] != null, "Expected non-null item #1");
+ assertCondition(fitems[1] != null, "Expected non-null item #2");
+ assertCondition(fitems[2] == null, "Expected null item #3");
+
+ return true;
+ }
+ catch (MgException ex) {
+ assertCondition(false, ex.getMessage());
+ }
+ catch (AssertException ex) {
+ assertFailures.add(ex);
+ }
+ return false;
+ }
+
+ private static boolean testPropertyDefinitionCollection() {
+ try {
+ MgClassDefinition parent = new MgClassDefinition();
+ parent.setName("Parent");
+ MgPropertyDefinitionCollection items = parent.getProperties();
+ MgPropertyDefinition item1 = new MgDataPropertyDefinition("Item1");
+ MgPropertyDefinition item2 = new MgDataPropertyDefinition("Item2");
+ MgPropertyDefinition item3 = new MgDataPropertyDefinition("Item3");
+ MgPropertyDefinition item4 = new MgDataPropertyDefinition("Item4");
+
+ //Items inserted the MapGuide API way
+ items.addItem(item1);
+ items.addItem(item2);
+ items.addItem(item3);
+
+ assertCondition(items.getCount() == 3, "Expected 3 items");
+ assertCondition(!items.isEmpty(), "Expected non-empty item collection");
+
+ int i = 0;
+ //Looping the classic way
+ for (i = 0; i < items.getCount(); i++) {
+ switch (i){
+ case 0:
+ assertCondition(items.getItem(i).getName().equals("Item1"), "Expected item #" + (i+1) + " to be Item1");
+ break;
+ case 1:
+ assertCondition(items.getItem(i).getName().equals("Item2"), "Expected item #" + (i+1) + " to be Item2");
+ break;
+ case 2:
+ assertCondition(items.getItem(i).getName().equals("Item3"), "Expected item #" + (i+1) + " to be Item3");
+ break;
+ }
+ }
+
+ //Looping the iterative way
+ i = 0;
+ for (MgPropertyDefinition item : items) {
+ String itemName = item.getName();
+ switch (i){
+ case 0:
+ assertCondition(itemName.equals("Item1"), "Expected item #" + (i+1) + " to be Item1");
+ break;
+ case 1:
+ assertCondition(itemName.equals("Item2"), "Expected item #" + (i+1) + " to be Item2");
+ break;
+ case 2:
+ assertCondition(itemName.equals("Item3"), "Expected item #" + (i+1) + " to be Item3");
+ break;
+ }
+ i++;
+ }
+
+ items.clear();
+ assertCondition(items.getCount() == 0, "Expected empty item collection");
+ assertCondition(items.isEmpty(), "Expected empty item collection");
+
+ //Now test through java.util.Collection facade
+ Collection<MgPropertyDefinition> facade = items;
+ //add()
+ assertCondition(facade.add(item1), "Could not add item1 the java.util.Collection way");
+ assertCondition(facade.add(item2), "Could not add item2 the java.util.Collection way");
+ assertCondition(facade.add(item3), "Could not add item3 the java.util.Collection way");
+
+ assertCondition(facade.size() == 3, "Expected 3 items");
+ assertCondition(!facade.isEmpty(), "Expected non-empty item collection");
+
+ //contains()
+ assertCondition(facade.contains(item1), "item1 should exist");
+ assertCondition(facade.contains(item2), "item2 should exist");
+ assertCondition(facade.contains(item3), "item3 should exist");
+
+ ArrayList<MgPropertyDefinition> testCollection = new ArrayList<MgPropertyDefinition>();
+ testCollection.add(item1);
+ testCollection.add(item2);
+ testCollection.add(item3);
+
+ //containsAll()
+ assertCondition(facade.containsAll(testCollection), "All items in test collection should match");
+ testCollection.clear();
+ testCollection.add(item1);
+ testCollection.add(item4);
+ assertCondition(!facade.containsAll(testCollection), "Should not have matched test collection");
+
+ facade.clear();
+ assertCondition(facade.size() == 0, "Expected 0 items");
+ assertCondition(facade.isEmpty(), "Expected empty item collection");
+
+ //addAll()
+ testCollection.clear();
+ testCollection.add(item1);
+ testCollection.add(item2);
+ testCollection.add(item3);
+ assertCondition(facade.addAll(testCollection), "Expected addAll() success");
+ assertCondition(facade.size() == 3, "Expected 3 items");
+ assertCondition(!facade.isEmpty(), "Expected non-empty item collection");
+
+ //remove()
+ assertCondition(!facade.remove(item4), "Expected remove() of non-existent item to return false");
+ assertCondition(!facade.remove(new MgFeatureSchema()), "Expected remove() of different type to return false");
+ assertCondition(facade.remove(item2), "Expected remove() of item2 to return true");
+
+ //removeAll()
+ testCollection.remove(item2);
+ assertCondition(facade.removeAll(testCollection), "Expected removeAll() to succeed");
+
+ //retainAll()
+ assertCondition(facade.add(item1), "Could not add item1 the java.util.Collection way");
+ assertCondition(facade.add(item2), "Could not add item2 the java.util.Collection way");
+ assertCondition(facade.add(item3), "Could not add item3 the java.util.Collection way");
+ assertCondition(facade.size() == 3, "Expected 3 schemas");
+ assertCondition(!facade.isEmpty(), "Expected non-empty schema collection");
+
+ testCollection.clear();
+ testCollection.add(item1);
+ testCollection.add(item3);
+ assertCondition(facade.retainAll(testCollection), "Expected retainAll() to succeed");
+ assertCondition(facade.contains(item1), "Expected item1 to exist");
+ assertCondition(!facade.contains(item2), "Expected item2 to not exist");
+ assertCondition(facade.contains(item3), "Expected item3 to exist");
+
+ //toArray()
+ Object[] itemArray = facade.toArray();
+ assertCondition(itemArray != null, "Expected non-null item array");
+ assertCondition(itemArray.length == 2, "Expected 2 item array");
+ for (Object o : itemArray) {
+ assertCondition(o instanceof MgPropertyDefinition, "Expected item to be MgPropertyDefinition");
+ }
+ MgPropertyDefinition[] fitems = facade.toArray(new MgPropertyDefinition[0]);
+ assertCondition(fitems != null, "Expected non-null item array");
+ assertCondition(fitems.length == 2, "Expected 2 item array");
+
+ fitems = facade.toArray(new MgPropertyDefinition[1]);
+ assertCondition(fitems != null, "Expected non-null item array");
+ assertCondition(fitems.length == 2, "Expected 2 item array");
+
+ fitems = facade.toArray(new MgPropertyDefinition[3]);
+ assertCondition(fitems != null, "Expected non-null item array");
+ assertCondition(fitems.length == 3, "Expected 3 item array");
+ assertCondition(fitems[0] != null, "Expected non-null item #1");
+ assertCondition(fitems[1] != null, "Expected non-null item #2");
+ assertCondition(fitems[2] == null, "Expected null item #3");
+
+ return true;
+ }
+ catch (MgException ex) {
+ assertCondition(false, ex.getMessage());
+ }
+ catch (AssertException ex) {
+ assertFailures.add(ex);
+ }
+ return false;
+ }
+
+ private static boolean testLayerCollection(MgSiteConnection siteConn, MgMap map) {
+ try {
+ map.open(mapName);
+ MgResourceService resSvc = (MgResourceService)siteConn.createService(MgServiceType.ResourceService);
+ MgLayerCollection items = map.getLayers();
+ items.clear();
+ MgResourceIdentifier ldfId = new MgResourceIdentifier("Library://Samples/Sheboygan/Layers/Parcels.LayerDefinition");
+ MgLayerBase item1 = new MgLayer(ldfId, resSvc);
+ item1.setName("Item1");
+ MgLayerBase item2 = new MgLayer(ldfId, resSvc);
+ item2.setName("Item2");
+ MgLayerBase item3 = new MgLayer(ldfId, resSvc);
+ item3.setName("Item3");
+ MgLayerBase item4 = new MgLayer(ldfId, resSvc);
+ item4.setName("Item4");
+
+ //Items inserted the MapGuide API way
+ items.addItem(item1);
+ items.addItem(item2);
+ items.addItem(item3);
+
+ assertCondition(items.getCount() == 3, "Expected 3 items");
+ assertCondition(!items.isEmpty(), "Expected non-empty item collection");
+
+ int i = 0;
+ //Looping the classic way
+ for (i = 0; i < items.getCount(); i++) {
+ switch (i){
+ case 0:
+ assertCondition(items.getItem(i).getName().equals("Item1"), "Expected item #" + (i+1) + " to be Item1");
+ break;
+ case 1:
+ assertCondition(items.getItem(i).getName().equals("Item2"), "Expected item #" + (i+1) + " to be Item2");
+ break;
+ case 2:
+ assertCondition(items.getItem(i).getName().equals("Item3"), "Expected item #" + (i+1) + " to be Item3");
+ break;
+ }
+ }
+
+ //Looping the iterative way
+ i = 0;
+ for (MgLayerBase item : items) {
+ String itemName = item.getName();
+ switch (i){
+ case 0:
+ assertCondition(itemName.equals("Item1"), "Expected item #" + (i+1) + " to be Item1");
+ break;
+ case 1:
+ assertCondition(itemName.equals("Item2"), "Expected item #" + (i+1) + " to be Item2");
+ break;
+ case 2:
+ assertCondition(itemName.equals("Item3"), "Expected item #" + (i+1) + " to be Item3");
+ break;
+ }
+ i++;
+ }
+
+ items.clear();
+ assertCondition(items.getCount() == 0, "Expected empty item collection");
+ assertCondition(items.isEmpty(), "Expected empty item collection");
+
+ //Now test through java.util.Collection facade
+ Collection<MgLayerBase> facade = items;
+ //add()
+ assertCondition(facade.add(item1), "Could not add item1 the java.util.Collection way");
+ assertCondition(facade.add(item2), "Could not add item2 the java.util.Collection way");
+ assertCondition(facade.add(item3), "Could not add item3 the java.util.Collection way");
+
+ assertCondition(facade.size() == 3, "Expected 3 items");
+ assertCondition(!facade.isEmpty(), "Expected non-empty item collection");
+
+ //contains()
+ assertCondition(facade.contains(item1), "item1 should exist");
+ assertCondition(facade.contains(item2), "item2 should exist");
+ assertCondition(facade.contains(item3), "item3 should exist");
+
+ ArrayList<MgLayerBase> testCollection = new ArrayList<MgLayerBase>();
+ testCollection.add(item1);
+ testCollection.add(item2);
+ testCollection.add(item3);
+
+ //containsAll()
+ assertCondition(facade.containsAll(testCollection), "All items in test collection should match");
+ testCollection.clear();
+ testCollection.add(item1);
+ testCollection.add(item4);
+ assertCondition(!facade.containsAll(testCollection), "Should not have matched test collection");
+
+ facade.clear();
+ assertCondition(facade.size() == 0, "Expected 0 items");
+ assertCondition(facade.isEmpty(), "Expected empty item collection");
+
+ //addAll()
+ testCollection.clear();
+ testCollection.add(item1);
+ testCollection.add(item2);
+ testCollection.add(item3);
+ assertCondition(facade.addAll(testCollection), "Expected addAll() success");
+ assertCondition(facade.size() == 3, "Expected 3 items");
+ assertCondition(!facade.isEmpty(), "Expected non-empty item collection");
+
+ //remove()
+ assertCondition(!facade.remove(item4), "Expected remove() of non-existent item to return false");
+ assertCondition(!facade.remove(new MgFeatureSchema()), "Expected remove() of different type to return false");
+ assertCondition(facade.remove(item2), "Expected remove() of item2 to return true");
+
+ //removeAll()
+ testCollection.remove(item2);
+ assertCondition(facade.removeAll(testCollection), "Expected removeAll() to succeed");
+
+ //retainAll()
+ assertCondition(facade.add(item1), "Could not add item1 the java.util.Collection way");
+ assertCondition(facade.add(item2), "Could not add item2 the java.util.Collection way");
+ assertCondition(facade.add(item3), "Could not add item3 the java.util.Collection way");
+ assertCondition(facade.size() == 3, "Expected 3 schemas");
+ assertCondition(!facade.isEmpty(), "Expected non-empty schema collection");
+
+ testCollection.clear();
+ testCollection.add(item1);
+ testCollection.add(item3);
+ assertCondition(facade.retainAll(testCollection), "Expected retainAll() to succeed");
+ assertCondition(facade.contains(item1), "Expected item1 to exist");
+ assertCondition(!facade.contains(item2), "Expected item2 to not exist");
+ assertCondition(facade.contains(item3), "Expected item3 to exist");
+
+ //toArray()
+ Object[] itemArray = facade.toArray();
+ assertCondition(itemArray != null, "Expected non-null item array");
+ assertCondition(itemArray.length == 2, "Expected 2 item array");
+ for (Object o : itemArray) {
+ assertCondition(o instanceof MgLayerBase, "Expected item to be MgLayerBase");
+ }
+ MgLayerBase[] fitems = facade.toArray(new MgLayerBase[0]);
+ assertCondition(fitems != null, "Expected non-null item array");
+ assertCondition(fitems.length == 2, "Expected 2 item array");
+
+ fitems = facade.toArray(new MgLayerBase[1]);
+ assertCondition(fitems != null, "Expected non-null item array");
+ assertCondition(fitems.length == 2, "Expected 2 item array");
+
+ fitems = facade.toArray(new MgLayerBase[3]);
+ assertCondition(fitems != null, "Expected non-null item array");
+ assertCondition(fitems.length == 3, "Expected 3 item array");
+ assertCondition(fitems[0] != null, "Expected non-null item #1");
+ assertCondition(fitems[1] != null, "Expected non-null item #2");
+ assertCondition(fitems[2] == null, "Expected null item #3");
+
+ return true;
+ }
+ catch (MgException ex) {
+ assertCondition(false, ex.getMessage());
+ }
+ catch (AssertException ex) {
+ assertFailures.add(ex);
+ }
+ return false;
+ }
+
+ private static boolean testLayerGroupCollection(MgSiteConnection siteConn, MgMap map) {
+ try {
+ map.open(mapName);
+ MgResourceService resSvc = (MgResourceService)siteConn.createService(MgServiceType.ResourceService);
+ MgLayerGroupCollection items = map.getLayerGroups();
+ items.clear();
+ MgResourceIdentifier ldfId = new MgResourceIdentifier("Library://Samples/Sheboygan/Layers/Parcels.LayerDefinition");
+ MgLayerGroup item1 = new MgLayerGroup("Item1");
+ MgLayerGroup item2 = new MgLayerGroup("Item2");
+ MgLayerGroup item3 = new MgLayerGroup("Item3");
+ MgLayerGroup item4 = new MgLayerGroup("Item4");
+
+ //Items inserted the MapGuide API way
+ items.addItem(item1);
+ items.addItem(item2);
+ items.addItem(item3);
+
+ assertCondition(items.getCount() == 3, "Expected 3 items");
+ assertCondition(!items.isEmpty(), "Expected non-empty item collection");
+
+ int i = 0;
+ //Looping the classic way
+ for (i = 0; i < items.getCount(); i++) {
+ switch (i){
+ case 0:
+ assertCondition(items.getItem(i).getName().equals("Item1"), "Expected item #" + (i+1) + " to be Item1");
+ break;
+ case 1:
+ assertCondition(items.getItem(i).getName().equals("Item2"), "Expected item #" + (i+1) + " to be Item2");
+ break;
+ case 2:
+ assertCondition(items.getItem(i).getName().equals("Item3"), "Expected item #" + (i+1) + " to be Item3");
+ break;
+ }
+ }
+
+ //Looping the iterative way
+ i = 0;
+ for (MgLayerGroup item : items) {
+ String itemName = item.getName();
+ switch (i){
+ case 0:
+ assertCondition(itemName.equals("Item1"), "Expected item #" + (i+1) + " to be Item1");
+ break;
+ case 1:
+ assertCondition(itemName.equals("Item2"), "Expected item #" + (i+1) + " to be Item2");
+ break;
+ case 2:
+ assertCondition(itemName.equals("Item3"), "Expected item #" + (i+1) + " to be Item3");
+ break;
+ }
+ i++;
+ }
+
+ items.clear();
+ assertCondition(items.getCount() == 0, "Expected empty item collection");
+ assertCondition(items.isEmpty(), "Expected empty item collection");
+
+ //Now test through java.util.Collection facade
+ Collection<MgLayerGroup> facade = items;
+ //add()
+ assertCondition(facade.add(item1), "Could not add item1 the java.util.Collection way");
+ assertCondition(facade.add(item2), "Could not add item2 the java.util.Collection way");
+ assertCondition(facade.add(item3), "Could not add item3 the java.util.Collection way");
+
+ assertCondition(facade.size() == 3, "Expected 3 items");
+ assertCondition(!facade.isEmpty(), "Expected non-empty item collection");
+
+ //contains()
+ assertCondition(facade.contains(item1), "item1 should exist");
+ assertCondition(facade.contains(item2), "item2 should exist");
+ assertCondition(facade.contains(item3), "item3 should exist");
+
+ ArrayList<MgLayerGroup> testCollection = new ArrayList<MgLayerGroup>();
+ testCollection.add(item1);
+ testCollection.add(item2);
+ testCollection.add(item3);
+
+ //containsAll()
+ assertCondition(facade.containsAll(testCollection), "All items in test collection should match");
+ testCollection.clear();
+ testCollection.add(item1);
+ testCollection.add(item4);
+ assertCondition(!facade.containsAll(testCollection), "Should not have matched test collection");
+
+ facade.clear();
+ assertCondition(facade.size() == 0, "Expected 0 items");
+ assertCondition(facade.isEmpty(), "Expected empty item collection");
+
+ //addAll()
+ testCollection.clear();
+ testCollection.add(item1);
+ testCollection.add(item2);
+ testCollection.add(item3);
+ assertCondition(facade.addAll(testCollection), "Expected addAll() success");
+ assertCondition(facade.size() == 3, "Expected 3 items");
+ assertCondition(!facade.isEmpty(), "Expected non-empty item collection");
+
+ //remove()
+ assertCondition(!facade.remove(item4), "Expected remove() of non-existent item to return false");
+ assertCondition(!facade.remove(new MgFeatureSchema()), "Expected remove() of different type to return false");
+ assertCondition(facade.remove(item2), "Expected remove() of item2 to return true");
+
+ //removeAll()
+ testCollection.remove(item2);
+ assertCondition(facade.removeAll(testCollection), "Expected removeAll() to succeed");
+
+ //retainAll()
+ assertCondition(facade.add(item1), "Could not add item1 the java.util.Collection way");
+ assertCondition(facade.add(item2), "Could not add item2 the java.util.Collection way");
+ assertCondition(facade.add(item3), "Could not add item3 the java.util.Collection way");
+ assertCondition(facade.size() == 3, "Expected 3 schemas");
+ assertCondition(!facade.isEmpty(), "Expected non-empty schema collection");
+
+ testCollection.clear();
+ testCollection.add(item1);
+ testCollection.add(item3);
+ assertCondition(facade.retainAll(testCollection), "Expected retainAll() to succeed");
+ assertCondition(facade.contains(item1), "Expected item1 to exist");
+ assertCondition(!facade.contains(item2), "Expected item2 to not exist");
+ assertCondition(facade.contains(item3), "Expected item3 to exist");
+
+ //toArray()
+ Object[] itemArray = facade.toArray();
+ assertCondition(itemArray != null, "Expected non-null item array");
+ assertCondition(itemArray.length == 2, "Expected 2 item array");
+ for (Object o : itemArray) {
+ assertCondition(o instanceof MgLayerGroup, "Expected item to be MgLayerBase");
+ }
+ MgLayerGroup[] fitems = facade.toArray(new MgLayerGroup[0]);
+ assertCondition(fitems != null, "Expected non-null item array");
+ assertCondition(fitems.length == 2, "Expected 2 item array");
+
+ fitems = facade.toArray(new MgLayerGroup[1]);
+ assertCondition(fitems != null, "Expected non-null item array");
+ assertCondition(fitems.length == 2, "Expected 2 item array");
+
+ fitems = facade.toArray(new MgLayerGroup[3]);
+ assertCondition(fitems != null, "Expected non-null item array");
+ assertCondition(fitems.length == 3, "Expected 3 item array");
+ assertCondition(fitems[0] != null, "Expected non-null item #1");
+ assertCondition(fitems[1] != null, "Expected non-null item #2");
+ assertCondition(fitems[2] == null, "Expected null item #3");
+
+ return true;
+ }
+ catch (MgException ex) {
+ assertCondition(false, ex.getMessage());
+ }
+ catch (AssertException ex) {
+ assertFailures.add(ex);
+ }
+ return false;
+ }
+}
Modified: trunk/MgDev/Web/src/DotNetApi/Foundation/FoundationMakefile
===================================================================
--- trunk/MgDev/Web/src/DotNetApi/Foundation/FoundationMakefile 2013-01-09 19:09:42 UTC (rev 7296)
+++ trunk/MgDev/Web/src/DotNetApi/Foundation/FoundationMakefile 2013-01-12 03:36:03 UTC (rev 7297)
@@ -12,8 +12,8 @@
release: $(OUTDIR)\OSGeo.MapGuide.Foundation.dll
$(OUTDIR)\OSGeo.MapGuide.Foundation.Temp.dll:
- csc.exe /debug+ /debug:full /optimize- /out:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll /platform:$(PLATFORM) /target:library .\*.cs
+ csc.exe /debug+ /debug:full /optimize- /out:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll /doc:$(OUTDIR)\OSGeo.MapGuide.Foundation.xml /platform:$(PLATFORM) /target:library .\*.cs
copy /y $(OUTDIR)\OSGeo.MapGuide.Foundation.dll $(OUTDIR)\OSGeo.MapGuide.Foundation.Temp.dll
$(OUTDIR)\OSGeo.MapGuide.Foundation.dll:
- csc.exe /debug+ /debug:pdbonly /optimize+ /out:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll /platform:$(PLATFORM) /target:library .\*.cs
+ csc.exe /debug+ /debug:pdbonly /optimize+ /out:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll /doc:$(OUTDIR)\OSGeo.MapGuide.Foundation.xml /platform:$(PLATFORM) /target:library .\*.cs
Modified: trunk/MgDev/Web/src/DotNetApi/Geometry/GeometryMakefile
===================================================================
--- trunk/MgDev/Web/src/DotNetApi/Geometry/GeometryMakefile 2013-01-09 19:09:42 UTC (rev 7296)
+++ trunk/MgDev/Web/src/DotNetApi/Geometry/GeometryMakefile 2013-01-12 03:36:03 UTC (rev 7297)
@@ -12,8 +12,8 @@
release: $(OUTDIR)\OSGeo.MapGuide.Geometry.dll
$(OUTDIR)\OSGeo.MapGuide.Geometry.Temp.dll:
- csc.exe /debug+ /debug:full /optimize- /out:$(OUTDIR)\OSGeo.MapGuide.Geometry.dll /platform:$(PLATFORM) /reference:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll /target:library .\*.cs
+ csc.exe /debug+ /debug:full /optimize- /out:$(OUTDIR)\OSGeo.MapGuide.Geometry.dll /doc:$(OUTDIR)\OSGeo.MapGuide.Geometry.xml /platform:$(PLATFORM) /reference:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll /target:library .\*.cs
copy /y $(OUTDIR)\OSGeo.MapGuide.Geometry.dll $(OUTDIR)\OSGeo.MapGuide.Geometry.Temp.dll
$(OUTDIR)\OSGeo.MapGuide.Geometry.dll:
- csc.exe /debug+ /debug:pdbonly /optimize+ /out:$(OUTDIR)\OSGeo.MapGuide.Geometry.dll /platform:$(PLATFORM) /reference:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll /target:library .\*.cs
+ csc.exe /debug+ /debug:pdbonly /optimize+ /out:$(OUTDIR)\OSGeo.MapGuide.Geometry.dll /doc:$(OUTDIR)\OSGeo.MapGuide.Geometry.xml /platform:$(PLATFORM) /reference:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll /target:library .\*.cs
Modified: trunk/MgDev/Web/src/DotNetApi/MapGuideCommon/MapGuideCommonMakefile
===================================================================
--- trunk/MgDev/Web/src/DotNetApi/MapGuideCommon/MapGuideCommonMakefile 2013-01-09 19:09:42 UTC (rev 7296)
+++ trunk/MgDev/Web/src/DotNetApi/MapGuideCommon/MapGuideCommonMakefile 2013-01-12 03:36:03 UTC (rev 7297)
@@ -12,8 +12,8 @@
release: $(OUTDIR)\OSGeo.MapGuide.MapGuideCommon.dll
$(OUTDIR)\OSGeo.MapGuide.MapGuideCommon.Temp.dll:
- csc.exe /debug+ /debug:full /optimize- /out:$(OUTDIR)\OSGeo.MapGuide.MapGuideCommon.dll /platform:$(PLATFORM) /target:library /reference:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll;$(OUTDIR)\OSGeo.MapGuide.Geometry.dll;$(OUTDIR)\OSGeo.MapGuide.PlatformBase.dll .\*.cs
+ csc.exe /debug+ /debug:full /optimize- /out:$(OUTDIR)\OSGeo.MapGuide.MapGuideCommon.dll /doc:$(OUTDIR)\OSGeo.MapGuide.MapGuideCommon.xml /platform:$(PLATFORM) /target:library /reference:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll;$(OUTDIR)\OSGeo.MapGuide.Geometry.dll;$(OUTDIR)\OSGeo.MapGuide.PlatformBase.dll .\*.cs
copy /y $(OUTDIR)\OSGeo.MapGuide.MapGuideCommon.dll $(OUTDIR)\OSGeo.MapGuide.MapGuideCommon.Temp.dll
$(OUTDIR)\OSGeo.MapGuide.MapGuideCommon.dll:
- csc.exe /debug+ /debug:pdbonly /optimize+ /out:$(OUTDIR)\OSGeo.MapGuide.MapGuideCommon.dll /target:library /platform:$(PLATFORM) /reference:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll;$(OUTDIR)\OSGeo.MapGuide.Geometry.dll;$(OUTDIR)\OSGeo.MapGuide.PlatformBase.dll .\*.cs
+ csc.exe /debug+ /debug:pdbonly /optimize+ /out:$(OUTDIR)\OSGeo.MapGuide.MapGuideCommon.dll /doc:$(OUTDIR)\OSGeo.MapGuide.MapGuideCommon.xml /target:library /platform:$(PLATFORM) /reference:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll;$(OUTDIR)\OSGeo.MapGuide.Geometry.dll;$(OUTDIR)\OSGeo.MapGuide.PlatformBase.dll .\*.cs
Modified: trunk/MgDev/Web/src/DotNetApi/PlatformBase/PlatformBaseMakefile
===================================================================
--- trunk/MgDev/Web/src/DotNetApi/PlatformBase/PlatformBaseMakefile 2013-01-09 19:09:42 UTC (rev 7296)
+++ trunk/MgDev/Web/src/DotNetApi/PlatformBase/PlatformBaseMakefile 2013-01-12 03:36:03 UTC (rev 7297)
@@ -12,8 +12,8 @@
release: $(OUTDIR)\OSGeo.MapGuide.PlatformBase.dll
$(OUTDIR)\OSGeo.MapGuide.PlatformBase.Temp.dll:
- csc.exe /debug+ /debug:full /optimize- /out:$(OUTDIR)\OSGeo.MapGuide.PlatformBase.dll /platform:$(PLATFORM) /target:library /reference:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll;$(OUTDIR)\OSGeo.MapGuide.Geometry.dll .\*.cs
+ csc.exe /debug+ /debug:full /optimize- /out:$(OUTDIR)\OSGeo.MapGuide.PlatformBase.dll /doc:$(OUTDIR)\OSGeo.MapGuide.PlatformBase.xml /platform:$(PLATFORM) /target:library /reference:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll;$(OUTDIR)\OSGeo.MapGuide.Geometry.dll .\*.cs
copy /y $(OUTDIR)\OSGeo.MapGuide.PlatformBase.dll $(OUTDIR)\OSGeo.MapGuide.PlatformBase.Temp.dll
$(OUTDIR)\OSGeo.MapGuide.PlatformBase.dll:
- csc.exe /debug+ /debug:pdbonly /optimize+ /out:$(OUTDIR)\OSGeo.MapGuide.PlatformBase.dll /platform:$(PLATFORM) /target:library /reference:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll;$(OUTDIR)\OSGeo.MapGuide.Geometry.dll .\*.cs
+ csc.exe /debug+ /debug:pdbonly /optimize+ /out:$(OUTDIR)\OSGeo.MapGuide.PlatformBase.dll /doc:$(OUTDIR)\OSGeo.MapGuide.PlatformBase.xml /platform:$(PLATFORM) /target:library /reference:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll;$(OUTDIR)\OSGeo.MapGuide.Geometry.dll .\*.cs
Modified: trunk/MgDev/Web/src/DotNetApi/Web/WebMakefile
===================================================================
--- trunk/MgDev/Web/src/DotNetApi/Web/WebMakefile 2013-01-09 19:09:42 UTC (rev 7296)
+++ trunk/MgDev/Web/src/DotNetApi/Web/WebMakefile 2013-01-12 03:36:03 UTC (rev 7297)
@@ -12,8 +12,8 @@
release: $(OUTDIR)\OSGeo.MapGuide.Web.dll
$(OUTDIR)\OSGeo.MapGuide.Web.Temp.dll:
- csc.exe /debug+ /debug:full /optimize- /out:$(OUTDIR)\OSGeo.MapGuide.Web.dll /platform:$(PLATFORM) /target:library /reference:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll;$(OUTDIR)\OSGeo.MapGuide.Geometry.dll;$(OUTDIR)\OSGeo.MapGuide.PlatformBase.dll;$(OUTDIR)\OSGeo.MapGuide.MapGuideCommon.dll .\*.cs
+ csc.exe /debug+ /debug:full /optimize- /out:$(OUTDIR)\OSGeo.MapGuide.Web.dll /doc:$(OUTDIR)\OSGeo.MapGuide.Web.xml /platform:$(PLATFORM) /target:library /reference:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll;$(OUTDIR)\OSGeo.MapGuide.Geometry.dll;$(OUTDIR)\OSGeo.MapGuide.PlatformBase.dll;$(OUTDIR)\OSGeo.MapGuide.MapGuideCommon.dll .\*.cs
copy /y $(OUTDIR)\OSGeo.MapGuide.Web.dll $(OUTDIR)\OSGeo.MapGuide.Web.Temp.dll
$(OUTDIR)\OSGeo.MapGuide.Web.dll:
- csc.exe /debug+ /debug:pdbonly /optimize+ /out:$(OUTDIR)\OSGeo.MapGuide.Web.dll /platform:$(PLATFORM) /target:library /reference:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll;$(OUTDIR)\OSGeo.MapGuide.Geometry.dll;$(OUTDIR)\OSGeo.MapGuide.PlatformBase.dll;$(OUTDIR)\OSGeo.MapGuide.MapGuideCommon.dll .\*.cs
+ csc.exe /debug+ /debug:pdbonly /optimize+ /out:$(OUTDIR)\OSGeo.MapGuide.Web.dll /doc:$(OUTDIR)\OSGeo.MapGuide.Web.xml /platform:$(PLATFORM) /target:library /reference:$(OUTDIR)\OSGeo.MapGuide.Foundation.dll;$(OUTDIR)\OSGeo.MapGuide.Geometry.dll;$(OUTDIR)\OSGeo.MapGuide.PlatformBase.dll;$(OUTDIR)\OSGeo.MapGuide.MapGuideCommon.dll .\*.cs
Modified: trunk/MgDev/Web/src/DotNetUnmanagedApi/Foundation/FoundationApiGen.xml
===================================================================
--- trunk/MgDev/Web/src/DotNetUnmanagedApi/Foundation/FoundationApiGen.xml 2013-01-09 19:09:42 UTC (rev 7296)
+++ trunk/MgDev/Web/src/DotNetUnmanagedApi/Foundation/FoundationApiGen.xml 2013-01-12 03:36:03 UTC (rev 7297)
@@ -14,6 +14,7 @@
Target section.
-->
<Target path="./FoundationApi.i" />
+<DocTarget path="./FoundationApi_Doc.i" />
<!--
C++ inline section.
@@ -47,6 +48,7 @@
Swig inline section.
-->
<SwigInline>
+ %include "FoundationApi_Doc.i" //doc fragments
%include "language.i" //typemaps specific for each language
%include "../../../../Common/Foundation/System/FoundationClassId.h"
Modified: trunk/MgDev/Web/src/DotNetUnmanagedApi/Geometry/GeometryApiGen.xml
===================================================================
--- trunk/MgDev/Web/src/DotNetUnmanagedApi/Geometry/GeometryApiGen.xml 2013-01-09 19:09:42 UTC (rev 7296)
+++ trunk/MgDev/Web/src/DotNetUnmanagedApi/Geometry/GeometryApiGen.xml 2013-01-12 03:36:03 UTC (rev 7297)
@@ -14,6 +14,7 @@
Target section.
-->
<Target path="./GeometryApi.i" />
+<DocTarget path="./GeometryApi_Doc.i" />
<!--
C++ inline section.
@@ -49,6 +50,7 @@
-->
<SwigInline>
%import "../Foundation/FoundationApi.i"
+ %include "GeometryApi_Doc.i" //doc fragments
%include "language.i" //typemaps specific for each language
%include "../../../../Common/Geometry/GeometryClassId.h"
Modified: trunk/MgDev/Web/src/DotNetUnmanagedApi/MapGuideCommon/MapGuideCommonApiGen.xml
===================================================================
--- trunk/MgDev/Web/src/DotNetUnmanagedApi/MapGuideCommon/MapGuideCommonApiGen.xml 2013-01-09 19:09:42 UTC (rev 7296)
+++ trunk/MgDev/Web/src/DotNetUnmanagedApi/MapGuideCommon/MapGuideCommonApiGen.xml 2013-01-12 03:36:03 UTC (rev 7297)
@@ -14,6 +14,7 @@
Target section.
-->
<Target path="./MapGuideCommonApi.i" />
+<DocTarget path="./MapGuideCommonApi_Doc.i" />
<!--
C++ inline section.
@@ -52,6 +53,7 @@
%import "../Foundation/FoundationApi.i"
%import "../Geometry/GeometryApi.i"
%import "../PlatformBase/PlatformBaseApi.i"
+ %include "MapGuideCommonApi_Doc.i" //doc fragments
%include "language.i" //typemaps specific for each language
%include "../../../../Common/MapGuideCommon/System/MapGuideCommonClassId.h"
Modified: trunk/MgDev/Web/src/DotNetUnmanagedApi/PlatformBase/PlatformBaseApiGen.xml
===================================================================
--- trunk/MgDev/Web/src/DotNetUnmanagedApi/PlatformBase/PlatformBaseApiGen.xml 2013-01-09 19:09:42 UTC (rev 7296)
+++ trunk/MgDev/Web/src/DotNetUnmanagedApi/PlatformBase/PlatformBaseApiGen.xml 2013-01-12 03:36:03 UTC (rev 7297)
@@ -14,6 +14,7 @@
Target section.
-->
<Target path="./PlatformBaseApi.i" />
+<DocTarget path="./PlatformBaseApi_Doc.i" />
<!--
C++ inline section.
@@ -51,6 +52,7 @@
<SwigInline>
%import "../Foundation/FoundationApi.i"
%import "../Geometry/GeometryApi.i"
+ %include "PlatformBaseApi_Doc.i" //doc fragments
%include "language.i" //typemaps specific for each language
%include "../../../../Common/PlatformBase/Services/PlatformBaseClassId.h"
Modified: trunk/MgDev/Web/src/DotNetUnmanagedApi/Web/WebApiGen.xml
===================================================================
--- trunk/MgDev/Web/src/DotNetUnmanagedApi/Web/WebApiGen.xml 2013-01-09 19:09:42 UTC (rev 7296)
+++ trunk/MgDev/Web/src/DotNetUnmanagedApi/Web/WebApiGen.xml 2013-01-12 03:36:03 UTC (rev 7297)
@@ -14,6 +14,7 @@
Target section.
-->
<Target path="./MapGuideApi.i" />
+<DocTarget path="./WebApi_Doc.i" />
<!--
C++ inline section.
@@ -61,6 +62,7 @@
%import "../Geometry/GeometryApi.i"
%import "../PlatformBase/PlatformBaseApi.i"
%import "../MapGuideCommon/MapGuideCommonApi.i"
+ %include "WebApi_Doc.i" //doc fragments
%include "language.i" //typemaps specific for each language
%include "InitializeWebTier.i"
%include "../../WebApp/WebAppClassId.h"
Property changes on: trunk/MgDev/Web/src/JavaApiEx
___________________________________________________________________
Added: bugtraq:number
+ true
Deleted: trunk/MgDev/Web/src/JavaApiEx/COPYRIGHT
===================================================================
--- sandbox/jng/swig-java/Web/src/JavaApiEx/COPYRIGHT 2012-12-08 14:59:43 UTC (rev 7251)
+++ trunk/MgDev/Web/src/JavaApiEx/COPYRIGHT 2013-01-12 03:36:03 UTC (rev 7297)
@@ -1,19 +0,0 @@
-Where copyrights have not been included in the source file, this
-copyright shall be used for all source files in this directory
-and subdirectories.
-
-Copyright (C) 2004-2011 by Autodesk, Inc.
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of version 2.1 of the GNU Lesser
-General Public License as published by the Free Software Foundation.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
Copied: trunk/MgDev/Web/src/JavaApiEx/COPYRIGHT (from rev 7251, sandbox/jng/swig-java/Web/src/JavaApiEx/COPYRIGHT)
===================================================================
--- trunk/MgDev/Web/src/JavaApiEx/COPYRIGHT (rev 0)
+++ trunk/MgDev/Web/src/JavaApiEx/COPYRIGHT 2013-01-12 03:36:03 UTC (rev 7297)
@@ -0,0 +1,19 @@
+Where copyrights have not been included in the source file, this
+copyright shall be used for all source files in this directory
+and subdirectories.
+
+Copyright (C) 2004-2011 by Autodesk, Inc.
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of version 2.1 of the GNU Lesser
+General Public License as published by the Free Software Foundation.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
Deleted: trunk/MgDev/Web/src/JavaApiEx/DIFFERENCES.txt
===================================================================
--- sandbox/jng/swig-java/Web/src/JavaApiEx/DIFFERENCES.txt 2012-12-08 14:59:43 UTC (rev 7251)
+++ trunk/MgDev/Web/src/JavaApiEx/DIFFERENCES.txt 2013-01-12 03:36:03 UTC (rev 7297)
@@ -1,51 +0,0 @@
-JavaApiEx differences from JavaApi
-==================================
-
-1. MgException/AppThrowable is no longer a checked exception
-
-AppThrowable now extends RuntimeException making it (and MgException and its subclasses) unchecked exceptions, all methods in the MapGuide API no longer have the (throws MgException) clause.
-
-2. Method names follow Java conventions
-
-All method names in the Java proxy classes are now in lowerCamelCase instead of the MapGuide-default UpperCamelCase
-
- eg. Instead of this:
-
- MgSiteConnection siteConn = new MgSiteConnection();
- MgUserInformation userInfo = new MgUserInfomration(sessionId);
- siteConn.Open(userInfo);
- MgFeatureService featureSvc = (MgFeatureService)siteConn.CreateService(MgServiceType.FeatureService);
- MgFeatureSchemaCollection schema = featureSvc.DescribeSchema(new MgResourceIdentifier("Library://Samples/Sheboygan/Data/Parcels.FeatureSource"), "SHP_Schema");
-
- It is now this:
-
- MgSiteConnection siteConn = new MgSiteConnection();
- MgUserInformation userInfo = new MgUserInfomration(sessionId);
- siteConn.open(userInfo); //Note the lowercase
- MgFeatureService featureSvc = (MgFeatureService)siteConn.CreateService(MgServiceType.FeatureService);
- MgFeatureSchemaCollection schema = featureSvc.describeSchema(new MgResourceIdentifier("Library://Samples/Sheboygan/Data/Parcels.FeatureSource"), "SHP_Schema"); //Note the lowercase
-
-3. The following MapGuide collection classes now implement java.util.Collection<T>:
-
- - MgBatchPropertyCollection (T is MgPropertyCollection)
- - MgClassDefinitionCollection (T is MgClassDefinition)
- - MgFeatureSchemaCollection (T is MgFeatureSchema)
- - MgPropertyCollection (T is MgProperty)
- - MgStringCollection (T is String)
-
-4. The following classes now implement java.util.Iterable<T> allowing them to be used in an enhanced for-loop
-
- - MgReadOnlyLayerCollection (T is MgLayerBase)
-
-5. To avoid naming conflicts with SWIG generated code and methods from inherited java classes or interfaces as a result of the above changes, the following class methods have been renamed in the Java MapGuide API:
-
- - MgPropertyDefinition.Delete is now MgPropertyDefinition.markAsDeleted
- - MgClassDefinition.Delete is now MgClassDefinition.markAsDeleted
- - MgFeatureSchema.Delete is now MgFeatureSchema.markAsDeleted
- - MgException.GetStackTrace is now MgException.getExceptionStackTrace
- - MgBatchPropertyCollection.Add is now MgBatchPropertyCollection.addItem
- - MgClassDefinitionCollection.Add is now MgClassDefinitionCollection.addItem
- - MgFeatureSchemaCollection.Add is now MgFeatureSchemaCollection.addItem
- - MgIntCollection.Add is now MgIntCollection.addItem
- - MgPropertyCollection.Add is now MgPropertyCollection.addItem
- - MgStringCollection.Add is now MgStringCollection.addItem
Copied: trunk/MgDev/Web/src/JavaApiEx/DIFFERENCES.txt (from rev 7251, sandbox/jng/swig-java/Web/src/JavaApiEx/DIFFERENCES.txt)
===================================================================
--- trunk/MgDev/Web/src/JavaApiEx/DIFFERENCES.txt (rev 0)
+++ trunk/MgDev/Web/src/JavaApiEx/DIFFERENCES.txt 2013-01-12 03:36:03 UTC (rev 7297)
@@ -0,0 +1,51 @@
+JavaApiEx differences from JavaApi
+==================================
+
+1. MgException/AppThrowable is no longer a checked exception
+
+AppThrowable now extends RuntimeException making it (and MgException and its subclasses) unchecked exceptions, all methods in the MapGuide API no longer have the (throws MgException) clause.
+
+2. Method names follow Java conventions
+
+All method names in the Java proxy classes are now in lowerCamelCase instead of the MapGuide-default UpperCamelCase
+
+ eg. Instead of this:
+
+ MgSiteConnection siteConn = new MgSiteConnection();
+ MgUserInformation userInfo = new MgUserInfomration(sessionId);
+ siteConn.Open(userInfo);
+ MgFeatureService featureSvc = (MgFeatureService)siteConn.CreateService(MgServiceType.FeatureService);
+ MgFeatureSchemaCollection schema = featureSvc.DescribeSchema(new MgResourceIdentifier("Library://Samples/Sheboygan/Data/Parcels.FeatureSource"), "SHP_Schema");
+
+ It is now this:
+
+ MgSiteConnection siteConn = new MgSiteConnection();
+ MgUserInformation userInfo = new MgUserInfomration(sessionId);
+ siteConn.open(userInfo); //Note the lowercase
+ MgFeatureService featureSvc = (MgFeatureService)siteConn.CreateService(MgServiceType.FeatureService);
+ MgFeatureSchemaCollection schema = featureSvc.describeSchema(new MgResourceIdentifier("Library://Samples/Sheboygan/Data/Parcels.FeatureSource"), "SHP_Schema"); //Note the lowercase
+
+3. The following MapGuide collection classes now implement java.util.Collection<T>:
+
+ - MgBatchPropertyCollection (T is MgPropertyCollection)
+ - MgClassDefinitionCollection (T is MgClassDefinition)
+ - MgFeatureSchemaCollection (T is MgFeatureSchema)
+ - MgPropertyCollection (T is MgProperty)
+ - MgStringCollection (T is String)
+
+4. The following classes now implement java.util.Iterable<T> allowing them to be used in an enhanced for-loop
+
+ - MgReadOnlyLayerCollection (T is MgLayerBase)
+
+5. To avoid naming conflicts with SWIG generated code and methods from inherited java classes or interfaces as a result of the above changes, the following class methods have been renamed in the Java MapGuide API:
+
+ - MgPropertyDefinition.Delete is now MgPropertyDefinition.markAsDeleted
+ - MgClassDefinition.Delete is now MgClassDefinition.markAsDeleted
+ - MgFeatureSchema.Delete is now MgFeatureSchema.markAsDeleted
+ - MgException.GetStackTrace is now MgException.getExceptionStackTrace
+ - MgBatchPropertyCollection.Add is now MgBatchPropertyCollection.addItem
+ - MgClassDefinitionCollection.Add is now MgClassDefinitionCollection.addItem
+ - MgFeatureSchemaCollection.Add is now MgFeatureSchemaCollection.addItem
+ - MgIntCollection.Add is now MgIntCollection.addItem
+ - MgPropertyCollection.Add is now MgPropertyCollection.addItem
+ - MgStringCollection.Add is now MgStringCollection.addItem
Deleted: trunk/MgDev/Web/src/JavaApiEx/JavaApiEx.rc
===================================================================
--- sandbox/jng/swig-java/Web/src/JavaApiEx/JavaApiEx.rc 2012-12-08 14:59:43 UTC (rev 7251)
+++ trunk/MgDev/Web/src/JavaApiEx/JavaApiEx.rc 2013-01-12 03:36:03 UTC (rev 7297)
@@ -1,96 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "winresrc.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE
-BEGIN
- "#include ""winresrc.h""\r\n"
- "\0"
-END
-
-2 TEXTINCLUDE
-BEGIN
- "\r\n"
- "\0"
-END
-
-#endif // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2,5,0,0
- PRODUCTVERSION 2,5,0,0
- FILEFLAGSMASK 0x17L
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "CompanyName", "Open Source Geospatial Foundation"
- VALUE "FileDescription", "MapGuideJavaApiEx Dynamic Link Library"
- VALUE "FileVersion", "2, 5, 0, 0"
- VALUE "InternalName", "MapGuideJavaApiEx"
- VALUE "LegalCopyright", "Copyright (C) 2006-2011 by Autodesk, Inc."
- VALUE "OriginalFilename", "MapGuideJavaApiEx.dll"
- VALUE "ProductName", "MapGuide Open Source"
- VALUE "ProductVersion", "2, 5, 0, 0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
-
-#endif // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif // not APSTUDIO_INVOKED
-
Copied: trunk/MgDev/Web/src/JavaApiEx/JavaApiEx.rc (from rev 7251, sandbox/jng/swig-java/Web/src/JavaApiEx/JavaApiEx.rc)
===================================================================
--- trunk/MgDev/Web/src/JavaApiEx/JavaApiEx.rc (rev 0)
+++ trunk/MgDev/Web/src/JavaApiEx/JavaApiEx.rc 2013-01-12 03:36:03 UTC (rev 7297)
@@ -0,0 +1,96 @@
+// Microsoft Visual C++ generated resource script.
+//
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "winresrc.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE
+BEGIN
+ "#include ""winresrc.h""\r\n"
+ "\0"
+END
+
+2 TEXTINCLUDE
+BEGIN
+ "\r\n"
+ "\0"
+END
+
+#endif // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 2,5,0,0
+ PRODUCTVERSION 2,5,0,0
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904b0"
+ BEGIN
+ VALUE "CompanyName", "Open Source Geospatial Foundation"
+ VALUE "FileDescription", "MapGuideJavaApiEx Dynamic Link Library"
+ VALUE "FileVersion", "2, 5, 0, 0"
+ VALUE "InternalName", "MapGuideJavaApiEx"
+ VALUE "LegalCopyright", "Copyright (C) 2006-2011 by Autodesk, Inc."
+ VALUE "OriginalFilename", "MapGuideJavaApiEx.dll"
+ VALUE "ProductName", "MapGuide Open Source"
+ VALUE "ProductVersion", "2, 5, 0, 0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1200
+ END
+END
+
+#endif // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif // not APSTUDIO_INVOKED
+
Deleted: trunk/MgDev/Web/src/JavaApiEx/JavaApiEx.vcxproj
===================================================================
--- sandbox/jng/swig-java/Web/src/JavaApiEx/JavaApiEx.vcxproj 2012-12-08 14:59:43 UTC (rev 7251)
+++ trunk/MgDev/Web/src/JavaApiEx/JavaApiEx.vcxproj 2013-01-12 03:36:03 UTC (rev 7297)
@@ -1,290 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{C02F44CB-D916-428D-A1A5-04E225A2A4EC}</ProjectGuid>
- <RootNamespace>JavaApi</RootNamespace>
- <Keyword>Win32Proj</Keyword>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>DynamicLibrary</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\bin\debug\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\obj\debug\JavaApiEx\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\bin\debug64\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\obj\debug64\JavaApiEx\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\bin\release\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\obj\release\JavaApiEx\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\bin\release64\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\obj\release64\JavaApiEx\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
- <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
- <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
- <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MapGuideJavaApiExd</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">MapGuideJavaApiExd</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MapGuideJavaApiEx</TargetName>
- <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MapGuideJavaApiEx</TargetName>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <PreBuildEvent>
- <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml Java .
-copy .\java.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
-..\..\..\Oem\SwigEx\Win32\swig -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -DWIN32 -dllname MapGuideJavaApiExd -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideJavaApiEx -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
-move /Y *.java org\osgeo\mapguide
-del org\osgeo\mapguide\*.class
-echo Building java classes...
-"$(JAVA_HOME)\bin\javac" -classpath . org\osgeo\mapguide\*.java
-echo Building JAR file
-"$(JAVA_HOME)\bin\jar" cf ..\WEB-INF\lib\MapGuideApid.jar org\osgeo\mapguide\*.class
-</Command>
- </PreBuildEvent>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;JAVA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <ExceptionHandling>Async</ExceptionHandling>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)MapGuideJavaApid.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)MapGuideJavaApid.pdb</ProgramDatabaseFile>
- <SubSystem>Windows</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <ImportLibrary>..\..\lib\debug\MapGuideJavaApid.lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <PreBuildEvent>
- <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml Java .
-copy .\java.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
-..\..\..\Oem\SwigEx\Win32\swig -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -DWIN32 -dllname MapGuideJavaApiExd -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideJavaApiEx -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
-move /Y *.java org\osgeo\mapguide
-del org\osgeo\mapguide\*.class
-echo Building java classes...
-"$(JAVA_HOME)\bin\javac" -classpath . org\osgeo\mapguide\*.java
-echo Building JAR file
-"$(JAVA_HOME)\bin\jar" cf ..\WEB-INF\lib\MapGuideApid.jar org\osgeo\mapguide\*.class
-</Command>
- </PreBuildEvent>
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;JAVA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <ExceptionHandling>Async</ExceptionHandling>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)MapGuideJavaApid.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)MapGuideJavaApid.pdb</ProgramDatabaseFile>
- <SubSystem>Windows</SubSystem>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <ImportLibrary>..\..\lib\debug64\MapGuideJavaApid.lib</ImportLibrary>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <PreBuildEvent>
- <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml Java .
-copy .\java.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
-..\..\..\Oem\SwigEx\Win32\swig -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -DWIN32 -dllname MapGuideJavaApiEx -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideJavaApiEx -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
-move /Y *.java org\osgeo\mapguide
-del org\osgeo\mapguide\*.class
-echo Building java classes...
-"$(JAVA_HOME)\bin\javac" -classpath . org\osgeo\mapguide\*.java
-echo Building JAR file
-"$(JAVA_HOME)\bin\jar" cf ..\WEB-INF\lib\MapGuideApiEx.jar org\osgeo\mapguide\*.class
-</Command>
- </PreBuildEvent>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;JAVA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <ExceptionHandling>Async</ExceptionHandling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)MapGuideJavaApiEx.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)MapGuideJavaApiEx.pdb</ProgramDatabaseFile>
- <SubSystem>Windows</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <ImportLibrary>..\..\lib\release\MapGuideJavaApiEx.lib</ImportLibrary>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <PreBuildEvent>
- <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml Java .
-copy .\java.i .\language.i
-..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
-..\..\..\Oem\SwigEx\Win32\swig -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -DWIN32 -dllname MapGuideJavaApiEx -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideJavaApiEx -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
-move /Y *.java org\osgeo\mapguide
-del org\osgeo\mapguide\*.class
-echo Building java classes...
-"$(JAVA_HOME)\bin\javac" -classpath . org\osgeo\mapguide\*.java
-echo Building JAR file
-"$(JAVA_HOME)\bin\jar" cf ..\WEB-INF\lib\MapGuideApiEx.jar org\osgeo\mapguide\*.class
-</Command>
- </PreBuildEvent>
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;JAVA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <ExceptionHandling>Async</ExceptionHandling>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <OutputFile>$(OutDir)MapGuideJavaApiEx.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <ProgramDatabaseFile>$(OutDir)MapGuideJavaApiEx.pdb</ProgramDatabaseFile>
- <SubSystem>Windows</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <RandomizedBaseAddress>false</RandomizedBaseAddress>
- <DataExecutionPrevention>
- </DataExecutionPrevention>
- <ImportLibrary>..\..\lib\release64\MapGuideJavaApiEx.lib</ImportLibrary>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <None Include="catchall.code" />
- <None Include="getclassid.code" />
- <None Include="java.i" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="JavaApiEx.rc" />
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="MgApi_wrap.cpp" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\..\Common\Foundation\Foundation.vcxproj">
- <Project>{a82adc7d-4da4-42f2-9bf6-df5dcfb44425}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Common\Geometry\Geometry.vcxproj">
- <Project>{d954daac-e305-40ce-b3f3-c229a0bef4f0}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Common\MapGuideCommon\MapGuideCommon.vcxproj">
- <Project>{5287a594-4d4f-43fe-a281-e279ab708cf1}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Common\PlatformBase\PlatformBase.vcxproj">
- <Project>{f7334b1b-0efa-47e3-8e66-df158e61b7e4}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="..\HttpHandler\HttpHandler.vcxproj">
- <Project>{78619d0e-d3f9-4ddf-b90e-f99cb03dfc44}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="..\WebApp\WebApp.vcxproj">
- <Project>{b797917b-6842-467c-8b14-e00b76a91247}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="..\WebSupport\WebSupport.vcxproj">
- <Project>{795b1b0e-4ec8-469d-b641-e26324266fbf}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file
Copied: trunk/MgDev/Web/src/JavaApiEx/JavaApiEx.vcxproj (from rev 7251, sandbox/jng/swig-java/Web/src/JavaApiEx/JavaApiEx.vcxproj)
===================================================================
--- trunk/MgDev/Web/src/JavaApiEx/JavaApiEx.vcxproj (rev 0)
+++ trunk/MgDev/Web/src/JavaApiEx/JavaApiEx.vcxproj 2013-01-12 03:36:03 UTC (rev 7297)
@@ -0,0 +1,290 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{C02F44CB-D916-428D-A1A5-04E225A2A4EC}</ProjectGuid>
+ <RootNamespace>JavaApi</RootNamespace>
+ <Keyword>Win32Proj</Keyword>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\bin\debug\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\obj\debug\JavaApiEx\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\bin\debug64\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\obj\debug64\JavaApiEx\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\bin\release\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\obj\release\JavaApiEx\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\bin\release64\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\obj\release64\JavaApiEx\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MapGuideJavaApiExd</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">MapGuideJavaApiExd</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MapGuideJavaApiEx</TargetName>
+ <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MapGuideJavaApiEx</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <PreBuildEvent>
+ <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml Java .
+copy .\java.i .\language.i
+..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
+..\..\..\Oem\SwigEx\Win32\swig -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -DWIN32 -dllname MapGuideJavaApiExd -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideJavaApiEx -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
+move /Y *.java org\osgeo\mapguide
+del org\osgeo\mapguide\*.class
+echo Building java classes...
+"$(JAVA_HOME)\bin\javac" -classpath . org\osgeo\mapguide\*.java
+echo Building JAR file
+"$(JAVA_HOME)\bin\jar" cf ..\WEB-INF\lib\MapGuideApid.jar org\osgeo\mapguide\*.class
+</Command>
+ </PreBuildEvent>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;JAVA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <ExceptionHandling>Async</ExceptionHandling>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)MapGuideJavaApid.dll</OutputFile>
+ <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(OutDir)MapGuideJavaApid.pdb</ProgramDatabaseFile>
+ <SubSystem>Windows</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <ImportLibrary>..\..\lib\debug\MapGuideJavaApid.lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <PreBuildEvent>
+ <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml Java .
+copy .\java.i .\language.i
+..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
+..\..\..\Oem\SwigEx\Win32\swig -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -DWIN32 -dllname MapGuideJavaApiExd -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideJavaApiEx -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
+move /Y *.java org\osgeo\mapguide
+del org\osgeo\mapguide\*.class
+echo Building java classes...
+"$(JAVA_HOME)\bin\javac" -classpath . org\osgeo\mapguide\*.java
+echo Building JAR file
+"$(JAVA_HOME)\bin\jar" cf ..\WEB-INF\lib\MapGuideApid.jar org\osgeo\mapguide\*.class
+</Command>
+ </PreBuildEvent>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;JAVA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <ExceptionHandling>Async</ExceptionHandling>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>ACEd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)MapGuideJavaApid.dll</OutputFile>
+ <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(OutDir)MapGuideJavaApid.pdb</ProgramDatabaseFile>
+ <SubSystem>Windows</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <ImportLibrary>..\..\lib\debug64\MapGuideJavaApid.lib</ImportLibrary>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <PreBuildEvent>
+ <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml Java .
+copy .\java.i .\language.i
+..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
+..\..\..\Oem\SwigEx\Win32\swig -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -DWIN32 -dllname MapGuideJavaApiEx -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideJavaApiEx -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
+move /Y *.java org\osgeo\mapguide
+del org\osgeo\mapguide\*.class
+echo Building java classes...
+"$(JAVA_HOME)\bin\javac" -classpath . org\osgeo\mapguide\*.java
+echo Building JAR file
+"$(JAVA_HOME)\bin\jar" cf ..\WEB-INF\lib\MapGuideApiEx.jar org\osgeo\mapguide\*.class
+</Command>
+ </PreBuildEvent>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;JAVA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <ExceptionHandling>Async</ExceptionHandling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)MapGuideJavaApiEx.dll</OutputFile>
+ <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(OutDir)MapGuideJavaApiEx.pdb</ProgramDatabaseFile>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <ImportLibrary>..\..\lib\release\MapGuideJavaApiEx.lib</ImportLibrary>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <PreBuildEvent>
+ <Command>..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\Constants.xml Java .
+copy .\java.i .\language.i
+..\..\..\BuildTools\WebTools\IMake\Win32\IMake.exe ..\MapGuideApi\MapGuideApiGen.xml Java
+..\..\..\Oem\SwigEx\Win32\swig -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -DWIN32 -dllname MapGuideJavaApiEx -package org.osgeo.mapguide -root Object -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise()%3b" -nodefault -noconstants -module MapGuideJavaApiEx -o MgApi_wrap.cpp -lib ..\..\..\Oem\SWIGEx\Lib MapGuideApi.i
+move /Y *.java org\osgeo\mapguide
+del org\osgeo\mapguide\*.class
+echo Building java classes...
+"$(JAVA_HOME)\bin\javac" -classpath . org\osgeo\mapguide\*.java
+echo Building JAR file
+"$(JAVA_HOME)\bin\jar" cf ..\WEB-INF\lib\MapGuideApiEx.jar org\osgeo\mapguide\*.class
+</Command>
+ </PreBuildEvent>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <AdditionalIncludeDirectories>..\HttpHandler;..\WebApp;..\WebSupport;..\..\..\Common\MdfModel;..\..\..\Common\Foundation;..\..\..\Common\PlatformBase;..\..\..\Common\Geometry;..\..\..\Common\MapGuideCommon;..\..\..\Oem\ACE\ACE_wrappers;..\..\..\Oem\dbxml\xerces-c-src\src;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;JAVA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <ExceptionHandling>Async</ExceptionHandling>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <AdditionalDependencies>ACE.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)MapGuideJavaApiEx.dll</OutputFile>
+ <AdditionalLibraryDirectories>..\..\..\Oem\ACE\ACE_wrappers\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(OutDir)MapGuideJavaApiEx.pdb</ProgramDatabaseFile>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <ImportLibrary>..\..\lib\release64\MapGuideJavaApiEx.lib</ImportLibrary>
+ <TargetMachine>MachineX64</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <None Include="catchall.code" />
+ <None Include="getclassid.code" />
+ <None Include="java.i" />
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="JavaApiEx.rc" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="MgApi_wrap.cpp" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\..\Common\Foundation\Foundation.vcxproj">
+ <Project>{a82adc7d-4da4-42f2-9bf6-df5dcfb44425}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Common\Geometry\Geometry.vcxproj">
+ <Project>{d954daac-e305-40ce-b3f3-c229a0bef4f0}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Common\MapGuideCommon\MapGuideCommon.vcxproj">
+ <Project>{5287a594-4d4f-43fe-a281-e279ab708cf1}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Common\PlatformBase\PlatformBase.vcxproj">
+ <Project>{f7334b1b-0efa-47e3-8e66-df158e61b7e4}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\HttpHandler\HttpHandler.vcxproj">
+ <Project>{78619d0e-d3f9-4ddf-b90e-f99cb03dfc44}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\WebApp\WebApp.vcxproj">
+ <Project>{b797917b-6842-467c-8b14-e00b76a91247}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ <ProjectReference Include="..\WebSupport\WebSupport.vcxproj">
+ <Project>{795b1b0e-4ec8-469d-b641-e26324266fbf}</Project>
+ <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+ </ProjectReference>
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
Deleted: trunk/MgDev/Web/src/JavaApiEx/Makefile.am
===================================================================
--- sandbox/jng/swig-java/Web/src/JavaApiEx/Makefile.am 2012-12-08 14:59:43 UTC (rev 7251)
+++ trunk/MgDev/Web/src/JavaApiEx/Makefile.am 2013-01-12 03:36:03 UTC (rev 7297)
@@ -1,468 +0,0 @@
-AUTOMAKE_OPTIONS = foreign
-
-EXTRA_DIST = getclassid.code \
- catchall.code \
- java.i \
- JavaApiEx.rc \
- JavaApiEx.vcproj \
- org/osgeo/mapguide/AppThrowable.java \
- org/osgeo/mapguide/MgBase64.java \
- org/osgeo/mapguide/MgLocalizer.java
-
-prefix=@prefix@/webserverextensions
-
-INCLUDES = -I../../../Common/MdfModel \
- -I../../../Common/Foundation \
- -I../../../Common/Geometry \
- -I../../../Common/PlatformBase \
- -I../../../Common/MapGuideCommon \
- -I$(JAVA_HOME)/include \
- -I$(JAVA_HOME)/include/linux \
- -I../../../Oem/ACE/ACE_wrappers \
- -I../HttpHandler \
- -I../WebSupport \
- -I../WebApp \
- -I../../../Oem/dbxml/xerces-c-src/src
-
-BUILT_SOURCES = MgApi_wrap.cpp
-
-lib_LTLIBRARIES = libMapGuideJavaApiEx.la
-
-nodist_libMapGuideJavaApiEx_la_SOURCES = MgApi_wrap.cpp
-
-AM_CXXFLAGS = @CXXFLAGS@ -fno-strict-aliasing -DJAVA
-
-libMapGuideJavaApiEx_la_LIBADD = \
- -lACE \
- -lMgFoundation \
- -lMgGeometry \
- -lMgPlatformBase \
- -lMgMapGuideCommon \
- -lMgHttpHandler \
- -lMgMdfModel \
- -lMgMdfParser \
- -lxerces-c \
- -lMgWebApp
-
-libMapGuideJavaApiEx_la_LDFLAGS = -release $(PACKAGE_VERSION) \
- -L../../../Oem/ACE/ACE_wrappers/ace \
- -L../../../Common/MdfModel \
- -L../../../Common/MdfParser \
- -L../../../Common/Foundation \
- -L../../../Common/Geometry \
- -L../../../Common/PlatformBase \
- -L../../../Common/MapGuideCommon \
- -L../HttpHandler \
- -L../WebApp \
- -L../../../Oem/dbxml/install/lib
-
-MgApi_wrap.cpp : \
- ../WebApp/WebApp.h \
- ../WebSupport/InitializeWebTier.cpp \
- ../../../Common/MdfModel/UnicodeString.h \
- ../HttpHandler/HttpHandlerApiDllExport.h \
- ../HttpHandler/HttpHandler.h \
- ../../../Common/Foundation/System/Object.h \
- ../../../Common/Foundation/System/Disposable.h \
- ../../../Common/Foundation/System/GuardDisposable.h \
- ../../../Common/Foundation/System/Serializable.h \
- ../../../Common/Foundation/System/NamedSerializable.h \
- ../../../Common/Foundation/Data/Collection.h \
- ../../../Common/Foundation/Data/Property.h \
- ../../../Common/Foundation/System/DisposableCollection.h \
- ../../../Common/Foundation/Data/BatchPropertyCollection.h \
- ../../../Common/Foundation/Data/ByteReader.h \
- ../../../Common/Foundation/Data/ByteSource.h \
- ../../../Common/Foundation/Data/ByteSink.h \
- ../../../Common/Foundation/Data/DateTime.h \
- ../../../Common/Foundation/Data/NullableProperty.h \
- ../../../Common/Foundation/Data/PropertyCollection.h \
- ../../../Common/Foundation/Data/PropertyDefinition.h \
- ../../../Common/Foundation/Data/StringCollection.h \
- ../../../Common/Foundation/Data/StringProperty.h \
- ../../../Common/Foundation/Data/FeaturePropertyType.h \
- ../../../Common/Foundation/Data/MimeType.h \
- ../../../Common/Foundation/Data/PropertyType.h \
- ../../../Common/Foundation/Exception/Exception.h \
- ../../../Common/Foundation/Exception/SystemException.h \
- ../../../Common/Foundation/Exception/IoException.h \
- ../../../Common/Foundation/Exception/FileIoException.h \
- ../../../Common/Foundation/Exception/ApplicationException.h \
- ../../../Common/Foundation/Exception/ThirdPartyException.h \
- ../../../Common/Foundation/Exception/StreamIoException.h \
- ../../../Common/Foundation/Exception/OutOfRangeException.h \
- ../../../Common/Foundation/Exception/ArgumentOutOfRangeException.h \
- ../../../Common/Foundation/Exception/ClassNotFoundException.h \
- ../../../Common/Foundation/Exception/ConfigurationException.h \
- ../../../Common/Foundation/Exception/ConfigurationLoadFailedException.h \
- ../../../Common/Foundation/Exception/ConfigurationSaveFailedException.h \
- ../../../Common/Foundation/Exception/DateTimeException.h \
- ../../../Common/Foundation/Exception/DecryptionException.h \
- ../../../Common/Foundation/Exception/DirectoryNotFoundException.h \
- ../../../Common/Foundation/Exception/DivideByZeroException.h \
- ../../../Common/Foundation/Exception/DomainException.h \
- ../../../Common/Foundation/Exception/DuplicateDirectoryException.h \
- ../../../Common/Foundation/Exception/DuplicateFileException.h \
- ../../../Common/Foundation/Exception/DuplicateObjectException.h \
- ../../../Common/Foundation/Exception/EncryptionException.h \
- ../../../Common/Foundation/Exception/FileNotFoundException.h \
- ../../../Common/Foundation/Exception/IndexOutOfRangeException.h \
- ../../../Common/Foundation/Exception/InvalidArgumentException.h \
- ../../../Common/Foundation/Exception/InvalidCastException.h \
- ../../../Common/Foundation/Exception/InvalidOperationException.h \
- ../../../Common/Foundation/Exception/InvalidPropertyTypeException.h \
- ../../../Common/Foundation/Exception/InvalidStreamHeaderException.h \
- ../../../Common/Foundation/Exception/LengthException.h \
- ../../../Common/Foundation/Exception/LogicException.h \
- ../../../Common/Foundation/Exception/NotFiniteNumberException.h \
- ../../../Common/Foundation/Exception/NotImplementedException.h \
- ../../../Common/Foundation/Exception/NullArgumentException.h \
- ../../../Common/Foundation/Exception/NullPropertyValueException.h \
- ../../../Common/Foundation/Exception/NullReferenceException.h \
- ../../../Common/Foundation/Exception/ObjectNotFoundException.h \
- ../../../Common/Foundation/Exception/OutOfMemoryException.h \
- ../../../Common/Foundation/Exception/OverflowException.h \
- ../../../Common/Foundation/Exception/PlatformNotSupportedException.h \
- ../../../Common/Foundation/Exception/ResourcesException.h \
- ../../../Common/Foundation/Exception/ResourcesLoadFailedException.h \
- ../../../Common/Foundation/Exception/RuntimeException.h \
- ../../../Common/Foundation/Exception/TemporaryFileNotAvailableException.h \
- ../../../Common/Foundation/Exception/UnclassifiedException.h \
- ../../../Common/Foundation/Exception/UnderflowException.h \
- ../../../Common/Foundation/Exception/XmlException.h \
- ../../../Common/Foundation/Exception/XmlParserException.h \
- ../../../Common/Geometry/GeometricEntity.h \
- ../../../Common/Geometry/Geometry.h \
- ../../../Common/Geometry/GeometryComponent.h \
- ../../../Common/Geometry/Curve.h \
- ../../../Common/Geometry/CurveSegment.h \
- ../../../Common/Geometry/Ring.h \
- ../../../Common/Geometry/Region.h \
- ../../../Common/Geometry/AgfReaderWriter.h \
- ../../../Common/Geometry/AggregateGeometry.h \
- ../../../Common/Geometry/ArcSegment.h \
- ../../../Common/Geometry/Coordinate.h \
- ../../../Common/Geometry/CoordinateCollection.h \
- ../../../Common/Geometry/CoordinateIterator.h \
- ../../../Common/Geometry/CoordinateXY.h \
- ../../../Common/Geometry/CoordinateXYM.h \
- ../../../Common/Geometry/CoordinateXYZ.h \
- ../../../Common/Geometry/CoordinateXYZM.h \
- ../../../Common/Geometry/CurvePolygon.h \
- ../../../Common/Geometry/CurvePolygonCollection.h \
- ../../../Common/Geometry/CurveRing.h \
- ../../../Common/Geometry/CurveRingCollection.h \
- ../../../Common/Geometry/CurveSegmentCollection.h \
- ../../../Common/Geometry/CurveString.h \
- ../../../Common/Geometry/CurveStringCollection.h \
- ../../../Common/Geometry/Envelope.h \
- ../../../Common/Geometry/GeometryCollection.h \
- ../../../Common/Geometry/GeometryFactory.h \
- ../../../Common/Geometry/LinearRing.h \
- ../../../Common/Geometry/LinearRingCollection.h \
- ../../../Common/Geometry/LinearSegment.h \
- ../../../Common/Geometry/LineString.h \
- ../../../Common/Geometry/LineStringCollection.h \
- ../../../Common/Geometry/Measure.h \
- ../../../Common/Geometry/MultiCurvePolygon.h \
- ../../../Common/Geometry/MultiCurveString.h \
- ../../../Common/Geometry/MultiGeometry.h \
- ../../../Common/Geometry/MultiLineString.h \
- ../../../Common/Geometry/MultiPoint.h \
- ../../../Common/Geometry/MultiPolygon.h \
- ../../../Common/Geometry/Point.h \
- ../../../Common/Geometry/PointCollection.h \
- ../../../Common/Geometry/Polygon.h \
- ../../../Common/Geometry/PolygonCollection.h \
- ../../../Common/Geometry/Transform.h \
- ../../../Common/Geometry/WktReaderWriter.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystem.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemDictionaryBase.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemCatalog.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemCategory.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemCategoryDictionary.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemDatum.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemDatumDictionary.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDefParams.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticPathElement.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticPath.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticPathDictionary.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDef.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformGridFile.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticAnalyticalTransformDefParams.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticInterpolationTransformDefParams.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticMultipleRegressionTransformDefParams.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticStandaloneTransformDefParams.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDefDictionary.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemDictionary.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemDictionaryUtility.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemEllipsoid.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemEllipsoidDictionary.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemEnum.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemEnumInteger32.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemFactory.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemFilter.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemFilterInteger32.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemFormatConverter.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformation.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGrids.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemMathComparator.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemMeasure.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemMgrs.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemProjectionInformation.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemTransform.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemUnitInformation.h \
- ../../../Common/Geometry/Exception/CoordinateSystemComputationFailedException.h \
- ../../../Common/Geometry/Exception/CoordinateSystemConversionFailedException.h \
- ../../../Common/Geometry/Exception/CoordinateSystemInitializationFailedException.h \
- ../../../Common/Geometry/Exception/CoordinateSystemLoadFailedException.h \
- ../../../Common/Geometry/Exception/CoordinateSystemMeasureFailedException.h \
- ../../../Common/Geometry/Exception/CoordinateSystemTransformFailedException.h \
- ../../../Common/Geometry/Exception/GeometryException.h \
- ../../../Common/Geometry/Exception/InvalidCoordinateSystemException.h \
- ../../../Common/Geometry/Exception/InvalidCoordinateSystemTypeException.h \
- ../../../Common/Geometry/Exception/InvalidCoordinateSystemUnitsException.h \
- ../../../Common/Geometry/CoordinateDimension.h \
- ../../../Common/Geometry/GeometricEntityType.h \
- ../../../Common/Geometry/GeometricPathInstructionType.h \
- ../../../Common/Geometry/GeometryComponentType.h \
- ../../../Common/Geometry/GeometryType.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemCodeFormat.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemErrorCode.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformationMethod.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGridOrientation.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGridSpecializationType.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemMgrsGridLevel.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemMgrsLetteringScheme.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemMgrsGridSquarePosition.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemProjectionCode.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemProjectionFormatType.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemProjectionLogicalType.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemProjectionParameterType.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemType.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemUnitCode.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemUnitType.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemWktFlavor.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDefType.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticAnalyticalTransformationMethod.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticMultipleRegressionTransformationMethod.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticStandaloneTransformationMethod.h \
- ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformGridFileFormat.h \
- ../../../Common/PlatformBase/Data/BlobProperty.h \
- ../../../Common/PlatformBase/Data/BooleanProperty.h \
- ../../../Common/PlatformBase/Data/ByteProperty.h \
- ../../../Common/PlatformBase/Data/ClobProperty.h \
- ../../../Common/PlatformBase/Data/Color.h \
- ../../../Common/PlatformBase/Data/DateTimeProperty.h \
- ../../../Common/PlatformBase/Data/DoubleProperty.h \
- ../../../Common/PlatformBase/Data/Int16Property.h \
- ../../../Common/PlatformBase/Data/Int32Property.h \
- ../../../Common/PlatformBase/Data/Int64Property.h \
- ../../../Common/PlatformBase/Data/IntCollection.h \
- ../../../Common/PlatformBase/Data/PropertyDefinitionCollection.h \
- ../../../Common/PlatformBase/Data/SingleProperty.h \
- ../../../Common/PlatformBase/Data/StringPropertyCollection.h \
- ../../../Common/PlatformBase/Exception/ArrayTypeMismatchException.h \
- ../../../Common/PlatformBase/Exception/DuplicateResourceDataException.h \
- ../../../Common/PlatformBase/Exception/DuplicateResourceException.h \
- ../../../Common/PlatformBase/Exception/EmptyFeatureSetException.h \
- ../../../Common/PlatformBase/Exception/FdoException.h \
- ../../../Common/PlatformBase/Exception/FeatureServiceException.h \
- ../../../Common/PlatformBase/Exception/InvalidMapDefinitionException.h \
- ../../../Common/PlatformBase/Exception/InvalidRepositoryNameException.h \
- ../../../Common/PlatformBase/Exception/InvalidRepositoryTypeException.h \
- ../../../Common/PlatformBase/Exception/InvalidResourceDataNameException.h \
- ../../../Common/PlatformBase/Exception/InvalidResourceDataTypeException.h \
- ../../../Common/PlatformBase/Exception/InvalidResourceNameException.h \
- ../../../Common/PlatformBase/Exception/InvalidResourcePathException.h \
- ../../../Common/PlatformBase/Exception/InvalidResourcePreProcessingTypeException.h \
- ../../../Common/PlatformBase/Exception/InvalidResourceTypeException.h \
- ../../../Common/PlatformBase/Exception/LayerNotFoundException.h \
- ../../../Common/PlatformBase/Exception/ResourceBusyException.h \
- ../../../Common/PlatformBase/Exception/ResourceDataNotFoundException.h \
- ../../../Common/PlatformBase/Exception/ResourceNotFoundException.h \
- ../../../Common/PlatformBase/Exception/ServiceNotAvailableException.h \
- ../../../Common/PlatformBase/Exception/ServiceNotSupportedException.h \
- ../../../Common/PlatformBase/Exception/UserNotFoundException.h \
- ../../../Common/PlatformBase/Services/FeatureCommand.h \
- ../../../Common/PlatformBase/Services/FeatureQueryOptions.h \
- ../../../Common/PlatformBase/Services/FeatureSourceParams.h \
- ../../../Common/PlatformBase/Services/Reader.h \
- ../../../Common/PlatformBase/Services/Service.h \
- ../../../Common/PlatformBase/Services/BaseService.h \
- ../../../Common/PlatformBase/Services/ClassDefinition.h \
- ../../../Common/PlatformBase/Services/ClassDefinitionCollection.h \
- ../../../Common/PlatformBase/Services/FileFeatureSourceParams.h \
- ../../../Common/PlatformBase/Services/CreateSdfParams.h \
- ../../../Common/PlatformBase/Services/DataPropertyDefinition.h \
- ../../../Common/PlatformBase/Services/DataReader.h \
- ../../../Common/PlatformBase/Services/DeleteFeatures.h \
- ../../../Common/PlatformBase/Services/FeatureAggregateOptions.h \
- ../../../Common/PlatformBase/Services/FeatureCommandCollection.h \
- ../../../Common/PlatformBase/Services/FeatureProperty.h \
- ../../../Common/PlatformBase/Services/FeatureReader.h \
- ../../../Common/PlatformBase/Services/FeatureSchema.h \
- ../../../Common/PlatformBase/Services/FeatureSchemaCollection.h \
- ../../../Common/PlatformBase/Services/FeatureService.h \
- ../../../Common/PlatformBase/Services/GeometricPropertyDefinition.h \
- ../../../Common/PlatformBase/Services/GeometryProperty.h \
- ../../../Common/PlatformBase/Services/GeometryTypeInfo.h \
- ../../../Common/PlatformBase/Services/GwsFeatureReader.h \
- ../../../Common/PlatformBase/Services/InsertFeatures.h \
- ../../../Common/PlatformBase/Services/LongTransactionReader.h \
- ../../../Common/PlatformBase/Services/ObjectPropertyDefinition.h \
- ../../../Common/PlatformBase/Services/Parameter.h \
- ../../../Common/PlatformBase/Services/ParameterCollection.h \
- ../../../Common/PlatformBase/Services/Raster.h \
- ../../../Common/PlatformBase/Services/RasterProperty.h \
- ../../../Common/PlatformBase/Services/RasterPropertyDefinition.h \
- ../../../Common/PlatformBase/Services/Resource.h \
- ../../../Common/PlatformBase/Services/ResourceIdentifier.h \
- ../../../Common/PlatformBase/Services/ResourceService.h \
- ../../../Common/PlatformBase/Services/SpatialContextReader.h \
- ../../../Common/PlatformBase/Services/SqlDataReader.h \
- ../../../Common/PlatformBase/Services/Transaction.h \
- ../../../Common/PlatformBase/Services/UpdateFeatures.h \
- ../../../Common/PlatformBase/Services/Warnings.h \
- ../../../Common/PlatformBase/Services/BaseServiceDefs.h \
- ../../../Common/PlatformBase/Services/FeatureCommandType.h \
- ../../../Common/PlatformBase/Services/FeatureGeometricType.h \
- ../../../Common/PlatformBase/Services/FeatureSpatialOperations.h \
- ../../../Common/PlatformBase/Services/ObjectPropertyType.h \
- ../../../Common/PlatformBase/Services/OrderingOption.h \
- ../../../Common/PlatformBase/Services/ParameterDirection.h \
- ../../../Common/PlatformBase/Services/RasterTypes.h \
- ../../../Common/PlatformBase/Services/ReaderType.h \
- ../../../Common/PlatformBase/Services/ResourceDefs.h \
- ../../../Common/PlatformBase/Services/SpatialContextExtentType.h \
- ../../../Common/PlatformBase/MapLayer/LayerBase.h \
- ../../../Common/PlatformBase/MapLayer/LayerCollection.h \
- ../../../Common/PlatformBase/MapLayer/LayerGroup.h \
- ../../../Common/PlatformBase/MapLayer/LayerGroupCollection.h \
- ../../../Common/PlatformBase/MapLayer/MapBase.h \
- ../../../Common/PlatformBase/MapLayer/MapCollection.h \
- ../../../Common/PlatformBase/MapLayer/ReadOnlyLayerCollection.h \
- ../../../Common/PlatformBase/MapLayer/SelectionBase.h \
- ../../../Common/PlatformBase/MapLayer/LayerGroupType.h \
- ../../../Common/PlatformBase/MapLayer/LayerType.h \
- ../../../Common/MapGuideCommon/Exception/AuthenticationFailedException.h \
- ../../../Common/MapGuideCommon/Exception/ConnectionFailedException.h \
- ../../../Common/MapGuideCommon/Exception/ConnectionNotOpenException.h \
- ../../../Common/MapGuideCommon/Exception/DbException.h \
- ../../../Common/MapGuideCommon/Exception/DbXmlException.h \
- ../../../Common/MapGuideCommon/Exception/DuplicateGroupException.h \
- ../../../Common/MapGuideCommon/Exception/DuplicateNameException.h \
- ../../../Common/MapGuideCommon/Exception/DuplicateParameterException.h \
- ../../../Common/MapGuideCommon/Exception/DuplicateRepositoryException.h \
- ../../../Common/MapGuideCommon/Exception/DuplicateRoleException.h \
- ../../../Common/MapGuideCommon/Exception/DuplicateServerException.h \
- ../../../Common/MapGuideCommon/Exception/DuplicateSessionException.h \
- ../../../Common/MapGuideCommon/Exception/DuplicateUserException.h \
- ../../../Common/MapGuideCommon/Exception/DwfException.h \
- ../../../Common/MapGuideCommon/Exception/DwfSectionNotFoundException.h \
- ../../../Common/MapGuideCommon/Exception/DwfSectionResourceNotFoundException.h \
- ../../../Common/MapGuideCommon/Exception/EndOfStreamException.h \
- ../../../Common/MapGuideCommon/Exception/GroupNotFoundException.h \
- ../../../Common/MapGuideCommon/Exception/InvalidDwfPackageException.h \
- ../../../Common/MapGuideCommon/Exception/InvalidDwfSectionException.h \
- ../../../Common/MapGuideCommon/Exception/InvalidFeatureSourceException.h \
- ../../../Common/MapGuideCommon/Exception/InvalidIpAddressException.h \
- ../../../Common/MapGuideCommon/Exception/InvalidLicenseException.h \
- ../../../Common/MapGuideCommon/Exception/InvalidLogEntryException.h \
- ../../../Common/MapGuideCommon/Exception/InvalidPasswordException.h \
- ../../../Common/MapGuideCommon/Exception/InvalidPrintLayoutFontSizeUnitsException.h \
- ../../../Common/MapGuideCommon/Exception/InvalidPrintLayoutPositionUnitsException.h \
- ../../../Common/MapGuideCommon/Exception/InvalidPrintLayoutSizeUnitsException.h \
- ../../../Common/MapGuideCommon/Exception/InvalidServerNameException.h \
- ../../../Common/MapGuideCommon/Exception/LicenseException.h \
- ../../../Common/MapGuideCommon/Exception/LicenseExpiredException.h \
- ../../../Common/MapGuideCommon/Exception/OperationProcessingException.h \
- ../../../Common/MapGuideCommon/Exception/ParameterNotFoundException.h \
- ../../../Common/MapGuideCommon/Exception/PathTooLongException.h \
- ../../../Common/MapGuideCommon/Exception/PortNotAvailableException.h \
- ../../../Common/MapGuideCommon/Exception/PrintToScaleModeNotSelectedException.h \
- ../../../Common/MapGuideCommon/Exception/RepositoryCreationFailedException.h \
- ../../../Common/MapGuideCommon/Exception/RepositoryNotFoundException.h \
- ../../../Common/MapGuideCommon/Exception/RepositoryNotOpenException.h \
- ../../../Common/MapGuideCommon/Exception/RepositoryOpenFailedException.h \
- ../../../Common/MapGuideCommon/Exception/RoleNotFoundException.h \
- ../../../Common/MapGuideCommon/Exception/ServerNotFoundException.h \
- ../../../Common/MapGuideCommon/Exception/ServerNotOnlineException.h \
- ../../../Common/MapGuideCommon/Exception/SessionExpiredException.h \
- ../../../Common/MapGuideCommon/Exception/SessionNotFoundException.h \
- ../../../Common/MapGuideCommon/Exception/UnauthorizedAccessException.h \
- ../../../Common/MapGuideCommon/Exception/UriFormatException.h \
- ../../../Common/MapGuideCommon/Services/DrawingService.h \
- ../../../Common/MapGuideCommon/Services/DwfVersion.h \
- ../../../Common/MapGuideCommon/Services/FeatureInformation.h \
- ../../../Common/MapGuideCommon/Services/KmlService.h \
- ../../../Common/MapGuideCommon/Services/Layout.h \
- ../../../Common/MapGuideCommon/Services/MappingService.h \
- ../../../Common/MapGuideCommon/Services/MapPlot.h \
- ../../../Common/MapGuideCommon/Services/MapPlotCollection.h \
- ../../../Common/MapGuideCommon/Services/PackageStatusInformation.h \
- ../../../Common/MapGuideCommon/Services/PlotSpecification.h \
- ../../../Common/MapGuideCommon/Services/ProfilingService.h \
- ../../../Common/MapGuideCommon/Services/RenderingOptions.h \
- ../../../Common/MapGuideCommon/Services/RenderingService.h \
- ../../../Common/MapGuideCommon/Services/ServerAdmin.h \
- ../../../Common/MapGuideCommon/Services/Site.h \
- ../../../Common/MapGuideCommon/Services/SiteConnection.h \
- ../../../Common/MapGuideCommon/Services/SiteInfo.h \
- ../../../Common/MapGuideCommon/Services/TileService.h \
- ../../../Common/MapGuideCommon/System/UserInformation.h \
- ../../../Common/MapGuideCommon/MapLayer/Layer.h \
- ../../../Common/MapGuideCommon/MapLayer/Map.h \
- ../../../Common/MapGuideCommon/MapLayer/Selection.h \
- ../../../Common/MapGuideCommon/Services/MappingDefs.h \
- ../../../Common/MapGuideCommon/Services/MapPlotInstruction.h \
- ../../../Common/MapGuideCommon/Services/ServerAdminDefs.h \
- ../../../Common/MapGuideCommon/Services/UnitType.h \
- ../../../Common/MapGuideCommon/System/ConfigProperties.h \
- ../WebApp/WebCommand.h \
- ../WebApp/WebUiTargetCommand.h \
- ../WebApp/WebWidget.h \
- ../WebApp/WebWidgetCollection.h \
- ../WebApp/WebUiPane.h \
- ../WebApp/WebUiSizablePane.h \
- ../WebApp/WebBufferCommand.h \
- ../WebApp/WebCommandCollection.h \
- ../WebApp/WebCommandWidget.h \
- ../WebApp/WebContextMenu.h \
- ../WebApp/WebFlyoutWidget.h \
- ../WebApp/WebGetPrintablePageCommand.h \
- ../WebApp/WebHelpCommand.h \
- ../WebApp/WebInformationPane.h \
- ../WebApp/WebInvokeScriptCommand.h \
- ../WebApp/WebInvokeUrlCommand.h \
- ../WebApp/WebLayout.h \
- ../WebApp/WebMeasureCommand.h \
- ../WebApp/WebPrintCommand.h \
- ../WebApp/WebSearchCommand.h \
- ../WebApp/WebSelectWithinCommand.h \
- ../WebApp/WebSeparatorWidget.h \
- ../WebApp/WebTaskBar.h \
- ../WebApp/WebTaskBarWidget.h \
- ../WebApp/WebTaskPane.h \
- ../WebApp/WebToolbar.h \
- ../WebApp/WebViewOptionsCommand.h \
- ../WebApp/WebActions.h \
- ../WebApp/WebTargetType.h \
- ../WebApp/WebTargetViewerType.h \
- ../WebApp/WebTaskButtonType.h \
- ../WebApp/WebWidgetType.h \
- ../HttpHandler/HttpHeader.h \
- ../HttpHandler/HttpPrimitiveValue.h \
- ../HttpHandler/HttpRequest.h \
- ../HttpHandler/HttpRequestMetadata.h \
- ../HttpHandler/HttpRequestParam.h \
- ../HttpHandler/HttpResponse.h \
- ../HttpHandler/HttpResult.h
- ../../../BuildTools/WebTools/IMake/Linux/IMake ../MapGuideApi/MapGuideApiGen.xml Java
- cp -f java.i language.i
- ../../../BuildTools/WebTools/IMake/Linux/IMake ../MapGuideApi/Constants.xml Java .
- ../../../Oem/SWIGEx/Linux/swig -dllname MapGuideJavaApiEx -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -package org.osgeo.mapguide -root MgObject -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise();" -nodefault -noconstants -module MapGuideJavaApiEx -o MgApi_wrap.cpp -lib ../../../Oem/SWIGEx/Lib MapGuideApi.i
- rm -f org/osgeo/mapguide/*.class
- mv -f *.java org/osgeo/mapguide
- $(JAVA_HOME)/bin/javac -classpath . org/osgeo/mapguide/*.java
- $(JAVA_HOME)/bin/jar cf ../WEB-INF/lib/MapGuideApiEx.jar org/osgeo/mapguide/*.class
Copied: trunk/MgDev/Web/src/JavaApiEx/Makefile.am (from rev 7251, sandbox/jng/swig-java/Web/src/JavaApiEx/Makefile.am)
===================================================================
--- trunk/MgDev/Web/src/JavaApiEx/Makefile.am (rev 0)
+++ trunk/MgDev/Web/src/JavaApiEx/Makefile.am 2013-01-12 03:36:03 UTC (rev 7297)
@@ -0,0 +1,468 @@
+AUTOMAKE_OPTIONS = foreign
+
+EXTRA_DIST = getclassid.code \
+ catchall.code \
+ java.i \
+ JavaApiEx.rc \
+ JavaApiEx.vcproj \
+ org/osgeo/mapguide/AppThrowable.java \
+ org/osgeo/mapguide/MgBase64.java \
+ org/osgeo/mapguide/MgLocalizer.java
+
+prefix=@prefix@/webserverextensions
+
+INCLUDES = -I../../../Common/MdfModel \
+ -I../../../Common/Foundation \
+ -I../../../Common/Geometry \
+ -I../../../Common/PlatformBase \
+ -I../../../Common/MapGuideCommon \
+ -I$(JAVA_HOME)/include \
+ -I$(JAVA_HOME)/include/linux \
+ -I../../../Oem/ACE/ACE_wrappers \
+ -I../HttpHandler \
+ -I../WebSupport \
+ -I../WebApp \
+ -I../../../Oem/dbxml/xerces-c-src/src
+
+BUILT_SOURCES = MgApi_wrap.cpp
+
+lib_LTLIBRARIES = libMapGuideJavaApiEx.la
+
+nodist_libMapGuideJavaApiEx_la_SOURCES = MgApi_wrap.cpp
+
+AM_CXXFLAGS = @CXXFLAGS@ -fno-strict-aliasing -DJAVA
+
+libMapGuideJavaApiEx_la_LIBADD = \
+ -lACE \
+ -lMgFoundation \
+ -lMgGeometry \
+ -lMgPlatformBase \
+ -lMgMapGuideCommon \
+ -lMgHttpHandler \
+ -lMgMdfModel \
+ -lMgMdfParser \
+ -lxerces-c \
+ -lMgWebApp
+
+libMapGuideJavaApiEx_la_LDFLAGS = -release $(PACKAGE_VERSION) \
+ -L../../../Oem/ACE/ACE_wrappers/ace \
+ -L../../../Common/MdfModel \
+ -L../../../Common/MdfParser \
+ -L../../../Common/Foundation \
+ -L../../../Common/Geometry \
+ -L../../../Common/PlatformBase \
+ -L../../../Common/MapGuideCommon \
+ -L../HttpHandler \
+ -L../WebApp \
+ -L../../../Oem/dbxml/install/lib
+
+MgApi_wrap.cpp : \
+ ../WebApp/WebApp.h \
+ ../WebSupport/InitializeWebTier.cpp \
+ ../../../Common/MdfModel/UnicodeString.h \
+ ../HttpHandler/HttpHandlerApiDllExport.h \
+ ../HttpHandler/HttpHandler.h \
+ ../../../Common/Foundation/System/Object.h \
+ ../../../Common/Foundation/System/Disposable.h \
+ ../../../Common/Foundation/System/GuardDisposable.h \
+ ../../../Common/Foundation/System/Serializable.h \
+ ../../../Common/Foundation/System/NamedSerializable.h \
+ ../../../Common/Foundation/Data/Collection.h \
+ ../../../Common/Foundation/Data/Property.h \
+ ../../../Common/Foundation/System/DisposableCollection.h \
+ ../../../Common/Foundation/Data/BatchPropertyCollection.h \
+ ../../../Common/Foundation/Data/ByteReader.h \
+ ../../../Common/Foundation/Data/ByteSource.h \
+ ../../../Common/Foundation/Data/ByteSink.h \
+ ../../../Common/Foundation/Data/DateTime.h \
+ ../../../Common/Foundation/Data/NullableProperty.h \
+ ../../../Common/Foundation/Data/PropertyCollection.h \
+ ../../../Common/Foundation/Data/PropertyDefinition.h \
+ ../../../Common/Foundation/Data/StringCollection.h \
+ ../../../Common/Foundation/Data/StringProperty.h \
+ ../../../Common/Foundation/Data/FeaturePropertyType.h \
+ ../../../Common/Foundation/Data/MimeType.h \
+ ../../../Common/Foundation/Data/PropertyType.h \
+ ../../../Common/Foundation/Exception/Exception.h \
+ ../../../Common/Foundation/Exception/SystemException.h \
+ ../../../Common/Foundation/Exception/IoException.h \
+ ../../../Common/Foundation/Exception/FileIoException.h \
+ ../../../Common/Foundation/Exception/ApplicationException.h \
+ ../../../Common/Foundation/Exception/ThirdPartyException.h \
+ ../../../Common/Foundation/Exception/StreamIoException.h \
+ ../../../Common/Foundation/Exception/OutOfRangeException.h \
+ ../../../Common/Foundation/Exception/ArgumentOutOfRangeException.h \
+ ../../../Common/Foundation/Exception/ClassNotFoundException.h \
+ ../../../Common/Foundation/Exception/ConfigurationException.h \
+ ../../../Common/Foundation/Exception/ConfigurationLoadFailedException.h \
+ ../../../Common/Foundation/Exception/ConfigurationSaveFailedException.h \
+ ../../../Common/Foundation/Exception/DateTimeException.h \
+ ../../../Common/Foundation/Exception/DecryptionException.h \
+ ../../../Common/Foundation/Exception/DirectoryNotFoundException.h \
+ ../../../Common/Foundation/Exception/DivideByZeroException.h \
+ ../../../Common/Foundation/Exception/DomainException.h \
+ ../../../Common/Foundation/Exception/DuplicateDirectoryException.h \
+ ../../../Common/Foundation/Exception/DuplicateFileException.h \
+ ../../../Common/Foundation/Exception/DuplicateObjectException.h \
+ ../../../Common/Foundation/Exception/EncryptionException.h \
+ ../../../Common/Foundation/Exception/FileNotFoundException.h \
+ ../../../Common/Foundation/Exception/IndexOutOfRangeException.h \
+ ../../../Common/Foundation/Exception/InvalidArgumentException.h \
+ ../../../Common/Foundation/Exception/InvalidCastException.h \
+ ../../../Common/Foundation/Exception/InvalidOperationException.h \
+ ../../../Common/Foundation/Exception/InvalidPropertyTypeException.h \
+ ../../../Common/Foundation/Exception/InvalidStreamHeaderException.h \
+ ../../../Common/Foundation/Exception/LengthException.h \
+ ../../../Common/Foundation/Exception/LogicException.h \
+ ../../../Common/Foundation/Exception/NotFiniteNumberException.h \
+ ../../../Common/Foundation/Exception/NotImplementedException.h \
+ ../../../Common/Foundation/Exception/NullArgumentException.h \
+ ../../../Common/Foundation/Exception/NullPropertyValueException.h \
+ ../../../Common/Foundation/Exception/NullReferenceException.h \
+ ../../../Common/Foundation/Exception/ObjectNotFoundException.h \
+ ../../../Common/Foundation/Exception/OutOfMemoryException.h \
+ ../../../Common/Foundation/Exception/OverflowException.h \
+ ../../../Common/Foundation/Exception/PlatformNotSupportedException.h \
+ ../../../Common/Foundation/Exception/ResourcesException.h \
+ ../../../Common/Foundation/Exception/ResourcesLoadFailedException.h \
+ ../../../Common/Foundation/Exception/RuntimeException.h \
+ ../../../Common/Foundation/Exception/TemporaryFileNotAvailableException.h \
+ ../../../Common/Foundation/Exception/UnclassifiedException.h \
+ ../../../Common/Foundation/Exception/UnderflowException.h \
+ ../../../Common/Foundation/Exception/XmlException.h \
+ ../../../Common/Foundation/Exception/XmlParserException.h \
+ ../../../Common/Geometry/GeometricEntity.h \
+ ../../../Common/Geometry/Geometry.h \
+ ../../../Common/Geometry/GeometryComponent.h \
+ ../../../Common/Geometry/Curve.h \
+ ../../../Common/Geometry/CurveSegment.h \
+ ../../../Common/Geometry/Ring.h \
+ ../../../Common/Geometry/Region.h \
+ ../../../Common/Geometry/AgfReaderWriter.h \
+ ../../../Common/Geometry/AggregateGeometry.h \
+ ../../../Common/Geometry/ArcSegment.h \
+ ../../../Common/Geometry/Coordinate.h \
+ ../../../Common/Geometry/CoordinateCollection.h \
+ ../../../Common/Geometry/CoordinateIterator.h \
+ ../../../Common/Geometry/CoordinateXY.h \
+ ../../../Common/Geometry/CoordinateXYM.h \
+ ../../../Common/Geometry/CoordinateXYZ.h \
+ ../../../Common/Geometry/CoordinateXYZM.h \
+ ../../../Common/Geometry/CurvePolygon.h \
+ ../../../Common/Geometry/CurvePolygonCollection.h \
+ ../../../Common/Geometry/CurveRing.h \
+ ../../../Common/Geometry/CurveRingCollection.h \
+ ../../../Common/Geometry/CurveSegmentCollection.h \
+ ../../../Common/Geometry/CurveString.h \
+ ../../../Common/Geometry/CurveStringCollection.h \
+ ../../../Common/Geometry/Envelope.h \
+ ../../../Common/Geometry/GeometryCollection.h \
+ ../../../Common/Geometry/GeometryFactory.h \
+ ../../../Common/Geometry/LinearRing.h \
+ ../../../Common/Geometry/LinearRingCollection.h \
+ ../../../Common/Geometry/LinearSegment.h \
+ ../../../Common/Geometry/LineString.h \
+ ../../../Common/Geometry/LineStringCollection.h \
+ ../../../Common/Geometry/Measure.h \
+ ../../../Common/Geometry/MultiCurvePolygon.h \
+ ../../../Common/Geometry/MultiCurveString.h \
+ ../../../Common/Geometry/MultiGeometry.h \
+ ../../../Common/Geometry/MultiLineString.h \
+ ../../../Common/Geometry/MultiPoint.h \
+ ../../../Common/Geometry/MultiPolygon.h \
+ ../../../Common/Geometry/Point.h \
+ ../../../Common/Geometry/PointCollection.h \
+ ../../../Common/Geometry/Polygon.h \
+ ../../../Common/Geometry/PolygonCollection.h \
+ ../../../Common/Geometry/Transform.h \
+ ../../../Common/Geometry/WktReaderWriter.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystem.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemDictionaryBase.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemCatalog.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemCategory.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemCategoryDictionary.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemDatum.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemDatumDictionary.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDefParams.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticPathElement.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticPath.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticPathDictionary.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDef.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformGridFile.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticAnalyticalTransformDefParams.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticInterpolationTransformDefParams.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticMultipleRegressionTransformDefParams.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticStandaloneTransformDefParams.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDefDictionary.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemDictionary.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemDictionaryUtility.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemEllipsoid.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemEllipsoidDictionary.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemEnum.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemEnumInteger32.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemFactory.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemFilter.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemFilterInteger32.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemFormatConverter.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformation.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGrids.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemMathComparator.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemMeasure.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemMgrs.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemProjectionInformation.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemTransform.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemUnitInformation.h \
+ ../../../Common/Geometry/Exception/CoordinateSystemComputationFailedException.h \
+ ../../../Common/Geometry/Exception/CoordinateSystemConversionFailedException.h \
+ ../../../Common/Geometry/Exception/CoordinateSystemInitializationFailedException.h \
+ ../../../Common/Geometry/Exception/CoordinateSystemLoadFailedException.h \
+ ../../../Common/Geometry/Exception/CoordinateSystemMeasureFailedException.h \
+ ../../../Common/Geometry/Exception/CoordinateSystemTransformFailedException.h \
+ ../../../Common/Geometry/Exception/GeometryException.h \
+ ../../../Common/Geometry/Exception/InvalidCoordinateSystemException.h \
+ ../../../Common/Geometry/Exception/InvalidCoordinateSystemTypeException.h \
+ ../../../Common/Geometry/Exception/InvalidCoordinateSystemUnitsException.h \
+ ../../../Common/Geometry/CoordinateDimension.h \
+ ../../../Common/Geometry/GeometricEntityType.h \
+ ../../../Common/Geometry/GeometricPathInstructionType.h \
+ ../../../Common/Geometry/GeometryComponentType.h \
+ ../../../Common/Geometry/GeometryType.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemCodeFormat.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemErrorCode.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformationMethod.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGridOrientation.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGridSpecializationType.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemMgrsGridLevel.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemMgrsLetteringScheme.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemMgrsGridSquarePosition.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemProjectionCode.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemProjectionFormatType.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemProjectionLogicalType.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemProjectionParameterType.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemType.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemUnitCode.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemUnitType.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemWktFlavor.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformDefType.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticAnalyticalTransformationMethod.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticMultipleRegressionTransformationMethod.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticStandaloneTransformationMethod.h \
+ ../../../Common/Geometry/CoordinateSystem/CoordinateSystemGeodeticTransformGridFileFormat.h \
+ ../../../Common/PlatformBase/Data/BlobProperty.h \
+ ../../../Common/PlatformBase/Data/BooleanProperty.h \
+ ../../../Common/PlatformBase/Data/ByteProperty.h \
+ ../../../Common/PlatformBase/Data/ClobProperty.h \
+ ../../../Common/PlatformBase/Data/Color.h \
+ ../../../Common/PlatformBase/Data/DateTimeProperty.h \
+ ../../../Common/PlatformBase/Data/DoubleProperty.h \
+ ../../../Common/PlatformBase/Data/Int16Property.h \
+ ../../../Common/PlatformBase/Data/Int32Property.h \
+ ../../../Common/PlatformBase/Data/Int64Property.h \
+ ../../../Common/PlatformBase/Data/IntCollection.h \
+ ../../../Common/PlatformBase/Data/PropertyDefinitionCollection.h \
+ ../../../Common/PlatformBase/Data/SingleProperty.h \
+ ../../../Common/PlatformBase/Data/StringPropertyCollection.h \
+ ../../../Common/PlatformBase/Exception/ArrayTypeMismatchException.h \
+ ../../../Common/PlatformBase/Exception/DuplicateResourceDataException.h \
+ ../../../Common/PlatformBase/Exception/DuplicateResourceException.h \
+ ../../../Common/PlatformBase/Exception/EmptyFeatureSetException.h \
+ ../../../Common/PlatformBase/Exception/FdoException.h \
+ ../../../Common/PlatformBase/Exception/FeatureServiceException.h \
+ ../../../Common/PlatformBase/Exception/InvalidMapDefinitionException.h \
+ ../../../Common/PlatformBase/Exception/InvalidRepositoryNameException.h \
+ ../../../Common/PlatformBase/Exception/InvalidRepositoryTypeException.h \
+ ../../../Common/PlatformBase/Exception/InvalidResourceDataNameException.h \
+ ../../../Common/PlatformBase/Exception/InvalidResourceDataTypeException.h \
+ ../../../Common/PlatformBase/Exception/InvalidResourceNameException.h \
+ ../../../Common/PlatformBase/Exception/InvalidResourcePathException.h \
+ ../../../Common/PlatformBase/Exception/InvalidResourcePreProcessingTypeException.h \
+ ../../../Common/PlatformBase/Exception/InvalidResourceTypeException.h \
+ ../../../Common/PlatformBase/Exception/LayerNotFoundException.h \
+ ../../../Common/PlatformBase/Exception/ResourceBusyException.h \
+ ../../../Common/PlatformBase/Exception/ResourceDataNotFoundException.h \
+ ../../../Common/PlatformBase/Exception/ResourceNotFoundException.h \
+ ../../../Common/PlatformBase/Exception/ServiceNotAvailableException.h \
+ ../../../Common/PlatformBase/Exception/ServiceNotSupportedException.h \
+ ../../../Common/PlatformBase/Exception/UserNotFoundException.h \
+ ../../../Common/PlatformBase/Services/FeatureCommand.h \
+ ../../../Common/PlatformBase/Services/FeatureQueryOptions.h \
+ ../../../Common/PlatformBase/Services/FeatureSourceParams.h \
+ ../../../Common/PlatformBase/Services/Reader.h \
+ ../../../Common/PlatformBase/Services/Service.h \
+ ../../../Common/PlatformBase/Services/BaseService.h \
+ ../../../Common/PlatformBase/Services/ClassDefinition.h \
+ ../../../Common/PlatformBase/Services/ClassDefinitionCollection.h \
+ ../../../Common/PlatformBase/Services/FileFeatureSourceParams.h \
+ ../../../Common/PlatformBase/Services/CreateSdfParams.h \
+ ../../../Common/PlatformBase/Services/DataPropertyDefinition.h \
+ ../../../Common/PlatformBase/Services/DataReader.h \
+ ../../../Common/PlatformBase/Services/DeleteFeatures.h \
+ ../../../Common/PlatformBase/Services/FeatureAggregateOptions.h \
+ ../../../Common/PlatformBase/Services/FeatureCommandCollection.h \
+ ../../../Common/PlatformBase/Services/FeatureProperty.h \
+ ../../../Common/PlatformBase/Services/FeatureReader.h \
+ ../../../Common/PlatformBase/Services/FeatureSchema.h \
+ ../../../Common/PlatformBase/Services/FeatureSchemaCollection.h \
+ ../../../Common/PlatformBase/Services/FeatureService.h \
+ ../../../Common/PlatformBase/Services/GeometricPropertyDefinition.h \
+ ../../../Common/PlatformBase/Services/GeometryProperty.h \
+ ../../../Common/PlatformBase/Services/GeometryTypeInfo.h \
+ ../../../Common/PlatformBase/Services/GwsFeatureReader.h \
+ ../../../Common/PlatformBase/Services/InsertFeatures.h \
+ ../../../Common/PlatformBase/Services/LongTransactionReader.h \
+ ../../../Common/PlatformBase/Services/ObjectPropertyDefinition.h \
+ ../../../Common/PlatformBase/Services/Parameter.h \
+ ../../../Common/PlatformBase/Services/ParameterCollection.h \
+ ../../../Common/PlatformBase/Services/Raster.h \
+ ../../../Common/PlatformBase/Services/RasterProperty.h \
+ ../../../Common/PlatformBase/Services/RasterPropertyDefinition.h \
+ ../../../Common/PlatformBase/Services/Resource.h \
+ ../../../Common/PlatformBase/Services/ResourceIdentifier.h \
+ ../../../Common/PlatformBase/Services/ResourceService.h \
+ ../../../Common/PlatformBase/Services/SpatialContextReader.h \
+ ../../../Common/PlatformBase/Services/SqlDataReader.h \
+ ../../../Common/PlatformBase/Services/Transaction.h \
+ ../../../Common/PlatformBase/Services/UpdateFeatures.h \
+ ../../../Common/PlatformBase/Services/Warnings.h \
+ ../../../Common/PlatformBase/Services/BaseServiceDefs.h \
+ ../../../Common/PlatformBase/Services/FeatureCommandType.h \
+ ../../../Common/PlatformBase/Services/FeatureGeometricType.h \
+ ../../../Common/PlatformBase/Services/FeatureSpatialOperations.h \
+ ../../../Common/PlatformBase/Services/ObjectPropertyType.h \
+ ../../../Common/PlatformBase/Services/OrderingOption.h \
+ ../../../Common/PlatformBase/Services/ParameterDirection.h \
+ ../../../Common/PlatformBase/Services/RasterTypes.h \
+ ../../../Common/PlatformBase/Services/ReaderType.h \
+ ../../../Common/PlatformBase/Services/ResourceDefs.h \
+ ../../../Common/PlatformBase/Services/SpatialContextExtentType.h \
+ ../../../Common/PlatformBase/MapLayer/LayerBase.h \
+ ../../../Common/PlatformBase/MapLayer/LayerCollection.h \
+ ../../../Common/PlatformBase/MapLayer/LayerGroup.h \
+ ../../../Common/PlatformBase/MapLayer/LayerGroupCollection.h \
+ ../../../Common/PlatformBase/MapLayer/MapBase.h \
+ ../../../Common/PlatformBase/MapLayer/MapCollection.h \
+ ../../../Common/PlatformBase/MapLayer/ReadOnlyLayerCollection.h \
+ ../../../Common/PlatformBase/MapLayer/SelectionBase.h \
+ ../../../Common/PlatformBase/MapLayer/LayerGroupType.h \
+ ../../../Common/PlatformBase/MapLayer/LayerType.h \
+ ../../../Common/MapGuideCommon/Exception/AuthenticationFailedException.h \
+ ../../../Common/MapGuideCommon/Exception/ConnectionFailedException.h \
+ ../../../Common/MapGuideCommon/Exception/ConnectionNotOpenException.h \
+ ../../../Common/MapGuideCommon/Exception/DbException.h \
+ ../../../Common/MapGuideCommon/Exception/DbXmlException.h \
+ ../../../Common/MapGuideCommon/Exception/DuplicateGroupException.h \
+ ../../../Common/MapGuideCommon/Exception/DuplicateNameException.h \
+ ../../../Common/MapGuideCommon/Exception/DuplicateParameterException.h \
+ ../../../Common/MapGuideCommon/Exception/DuplicateRepositoryException.h \
+ ../../../Common/MapGuideCommon/Exception/DuplicateRoleException.h \
+ ../../../Common/MapGuideCommon/Exception/DuplicateServerException.h \
+ ../../../Common/MapGuideCommon/Exception/DuplicateSessionException.h \
+ ../../../Common/MapGuideCommon/Exception/DuplicateUserException.h \
+ ../../../Common/MapGuideCommon/Exception/DwfException.h \
+ ../../../Common/MapGuideCommon/Exception/DwfSectionNotFoundException.h \
+ ../../../Common/MapGuideCommon/Exception/DwfSectionResourceNotFoundException.h \
+ ../../../Common/MapGuideCommon/Exception/EndOfStreamException.h \
+ ../../../Common/MapGuideCommon/Exception/GroupNotFoundException.h \
+ ../../../Common/MapGuideCommon/Exception/InvalidDwfPackageException.h \
+ ../../../Common/MapGuideCommon/Exception/InvalidDwfSectionException.h \
+ ../../../Common/MapGuideCommon/Exception/InvalidFeatureSourceException.h \
+ ../../../Common/MapGuideCommon/Exception/InvalidIpAddressException.h \
+ ../../../Common/MapGuideCommon/Exception/InvalidLicenseException.h \
+ ../../../Common/MapGuideCommon/Exception/InvalidLogEntryException.h \
+ ../../../Common/MapGuideCommon/Exception/InvalidPasswordException.h \
+ ../../../Common/MapGuideCommon/Exception/InvalidPrintLayoutFontSizeUnitsException.h \
+ ../../../Common/MapGuideCommon/Exception/InvalidPrintLayoutPositionUnitsException.h \
+ ../../../Common/MapGuideCommon/Exception/InvalidPrintLayoutSizeUnitsException.h \
+ ../../../Common/MapGuideCommon/Exception/InvalidServerNameException.h \
+ ../../../Common/MapGuideCommon/Exception/LicenseException.h \
+ ../../../Common/MapGuideCommon/Exception/LicenseExpiredException.h \
+ ../../../Common/MapGuideCommon/Exception/OperationProcessingException.h \
+ ../../../Common/MapGuideCommon/Exception/ParameterNotFoundException.h \
+ ../../../Common/MapGuideCommon/Exception/PathTooLongException.h \
+ ../../../Common/MapGuideCommon/Exception/PortNotAvailableException.h \
+ ../../../Common/MapGuideCommon/Exception/PrintToScaleModeNotSelectedException.h \
+ ../../../Common/MapGuideCommon/Exception/RepositoryCreationFailedException.h \
+ ../../../Common/MapGuideCommon/Exception/RepositoryNotFoundException.h \
+ ../../../Common/MapGuideCommon/Exception/RepositoryNotOpenException.h \
+ ../../../Common/MapGuideCommon/Exception/RepositoryOpenFailedException.h \
+ ../../../Common/MapGuideCommon/Exception/RoleNotFoundException.h \
+ ../../../Common/MapGuideCommon/Exception/ServerNotFoundException.h \
+ ../../../Common/MapGuideCommon/Exception/ServerNotOnlineException.h \
+ ../../../Common/MapGuideCommon/Exception/SessionExpiredException.h \
+ ../../../Common/MapGuideCommon/Exception/SessionNotFoundException.h \
+ ../../../Common/MapGuideCommon/Exception/UnauthorizedAccessException.h \
+ ../../../Common/MapGuideCommon/Exception/UriFormatException.h \
+ ../../../Common/MapGuideCommon/Services/DrawingService.h \
+ ../../../Common/MapGuideCommon/Services/DwfVersion.h \
+ ../../../Common/MapGuideCommon/Services/FeatureInformation.h \
+ ../../../Common/MapGuideCommon/Services/KmlService.h \
+ ../../../Common/MapGuideCommon/Services/Layout.h \
+ ../../../Common/MapGuideCommon/Services/MappingService.h \
+ ../../../Common/MapGuideCommon/Services/MapPlot.h \
+ ../../../Common/MapGuideCommon/Services/MapPlotCollection.h \
+ ../../../Common/MapGuideCommon/Services/PackageStatusInformation.h \
+ ../../../Common/MapGuideCommon/Services/PlotSpecification.h \
+ ../../../Common/MapGuideCommon/Services/ProfilingService.h \
+ ../../../Common/MapGuideCommon/Services/RenderingOptions.h \
+ ../../../Common/MapGuideCommon/Services/RenderingService.h \
+ ../../../Common/MapGuideCommon/Services/ServerAdmin.h \
+ ../../../Common/MapGuideCommon/Services/Site.h \
+ ../../../Common/MapGuideCommon/Services/SiteConnection.h \
+ ../../../Common/MapGuideCommon/Services/SiteInfo.h \
+ ../../../Common/MapGuideCommon/Services/TileService.h \
+ ../../../Common/MapGuideCommon/System/UserInformation.h \
+ ../../../Common/MapGuideCommon/MapLayer/Layer.h \
+ ../../../Common/MapGuideCommon/MapLayer/Map.h \
+ ../../../Common/MapGuideCommon/MapLayer/Selection.h \
+ ../../../Common/MapGuideCommon/Services/MappingDefs.h \
+ ../../../Common/MapGuideCommon/Services/MapPlotInstruction.h \
+ ../../../Common/MapGuideCommon/Services/ServerAdminDefs.h \
+ ../../../Common/MapGuideCommon/Services/UnitType.h \
+ ../../../Common/MapGuideCommon/System/ConfigProperties.h \
+ ../WebApp/WebCommand.h \
+ ../WebApp/WebUiTargetCommand.h \
+ ../WebApp/WebWidget.h \
+ ../WebApp/WebWidgetCollection.h \
+ ../WebApp/WebUiPane.h \
+ ../WebApp/WebUiSizablePane.h \
+ ../WebApp/WebBufferCommand.h \
+ ../WebApp/WebCommandCollection.h \
+ ../WebApp/WebCommandWidget.h \
+ ../WebApp/WebContextMenu.h \
+ ../WebApp/WebFlyoutWidget.h \
+ ../WebApp/WebGetPrintablePageCommand.h \
+ ../WebApp/WebHelpCommand.h \
+ ../WebApp/WebInformationPane.h \
+ ../WebApp/WebInvokeScriptCommand.h \
+ ../WebApp/WebInvokeUrlCommand.h \
+ ../WebApp/WebLayout.h \
+ ../WebApp/WebMeasureCommand.h \
+ ../WebApp/WebPrintCommand.h \
+ ../WebApp/WebSearchCommand.h \
+ ../WebApp/WebSelectWithinCommand.h \
+ ../WebApp/WebSeparatorWidget.h \
+ ../WebApp/WebTaskBar.h \
+ ../WebApp/WebTaskBarWidget.h \
+ ../WebApp/WebTaskPane.h \
+ ../WebApp/WebToolbar.h \
+ ../WebApp/WebViewOptionsCommand.h \
+ ../WebApp/WebActions.h \
+ ../WebApp/WebTargetType.h \
+ ../WebApp/WebTargetViewerType.h \
+ ../WebApp/WebTaskButtonType.h \
+ ../WebApp/WebWidgetType.h \
+ ../HttpHandler/HttpHeader.h \
+ ../HttpHandler/HttpPrimitiveValue.h \
+ ../HttpHandler/HttpRequest.h \
+ ../HttpHandler/HttpRequestMetadata.h \
+ ../HttpHandler/HttpRequestParam.h \
+ ../HttpHandler/HttpResponse.h \
+ ../HttpHandler/HttpResult.h
+ ../../../BuildTools/WebTools/IMake/Linux/IMake ../MapGuideApi/MapGuideApiGen.xml Java
+ cp -f java.i language.i
+ ../../../BuildTools/WebTools/IMake/Linux/IMake ../MapGuideApi/Constants.xml Java .
+ ../../../Oem/SWIGEx/Linux/swig -dllname MapGuideJavaApiEx -c++ -java -mgjavanothrow -mgjavacasing -DJAVA -package org.osgeo.mapguide -root MgObject -baseexception MgException -clsidcode getclassid.code -clsiddata m_cls_id -catchallcode catchall.code -dispose "((MgDisposable*)arg1)->Release()" -rethrow "e->Raise();" -nodefault -noconstants -module MapGuideJavaApiEx -o MgApi_wrap.cpp -lib ../../../Oem/SWIGEx/Lib MapGuideApi.i
+ rm -f org/osgeo/mapguide/*.class
+ mv -f *.java org/osgeo/mapguide
+ $(JAVA_HOME)/bin/javac -classpath . org/osgeo/mapguide/*.java
+ $(JAVA_HOME)/bin/jar cf ../WEB-INF/lib/MapGuideApiEx.jar org/osgeo/mapguide/*.class
Deleted: trunk/MgDev/Web/src/JavaApiEx/catchall.code
===================================================================
--- sandbox/jng/swig-java/Web/src/JavaApiEx/catchall.code 2012-12-08 14:59:43 UTC (rev 7251)
+++ trunk/MgDev/Web/src/JavaApiEx/catchall.code 2013-01-12 03:36:03 UTC (rev 7297)
@@ -1,8 +0,0 @@
-
-void onCatchAll(JNIEnv* jenv, const char* proxyfname)
-{
- string s = proxyfname;
- wstring fname = MgUtil::MultiByteToWideChar(s);
- MgUnclassifiedException* e = new MgUnclassifiedException(fname, __LINE__, __WFILE__, NULL, L"", NULL);
- ThrowJavaExceptionWrapper(jenv, e);
-}
Copied: trunk/MgDev/Web/src/JavaApiEx/catchall.code (from rev 7251, sandbox/jng/swig-java/Web/src/JavaApiEx/catchall.code)
===================================================================
--- trunk/MgDev/Web/src/JavaApiEx/catchall.code (rev 0)
+++ trunk/MgDev/Web/src/JavaApiEx/catchall.code 2013-01-12 03:36:03 UTC (rev 7297)
@@ -0,0 +1,8 @@
+
+void onCatchAll(JNIEnv* jenv, const char* proxyfname)
+{
+ string s = proxyfname;
+ wstring fname = MgUtil::MultiByteToWideChar(s);
+ MgUnclassifiedException* e = new MgUnclassifiedException(fname, __LINE__, __WFILE__, NULL, L"", NULL);
+ ThrowJavaExceptionWrapper(jenv, e);
+}
Deleted: trunk/MgDev/Web/src/JavaApiEx/getclassid.code
===================================================================
--- sandbox/jng/swig-java/Web/src/JavaApiEx/getclassid.code 2012-12-08 14:59:43 UTC (rev 7251)
+++ trunk/MgDev/Web/src/JavaApiEx/getclassid.code 2013-01-12 03:36:03 UTC (rev 7297)
@@ -1,6 +0,0 @@
-
-/* Get a class identifier from an Object instance */
-JNIEXPORT jint JNICALL Java_org_osgeo_mapguide_MapGuideJavaApiExJNI_getClassId(JNIEnv* jenv, jclass jcls, jlong jarg1)
-{
- return ((MgObject*)(void*)jarg1)->GetClassId();
-}
Copied: trunk/MgDev/Web/src/JavaApiEx/getclassid.code (from rev 7251, sandbox/jng/swig-java/Web/src/JavaApiEx/getclassid.code)
===================================================================
--- trunk/MgDev/Web/src/JavaApiEx/getclassid.code (rev 0)
+++ trunk/MgDev/Web/src/JavaApiEx/getclassid.code 2013-01-12 03:36:03 UTC (rev 7297)
@@ -0,0 +1,6 @@
+
+/* Get a class identifier from an Object instance */
+JNIEXPORT jint JNICALL Java_org_osgeo_mapguide_MapGuideJavaApiExJNI_getClassId(JNIEnv* jenv, jclass jcls, jlong jarg1)
+{
+ return ((MgObject*)(void*)jarg1)->GetClassId();
+}
Deleted: trunk/MgDev/Web/src/JavaApiEx/java.i
===================================================================
--- sandbox/jng/swig-java/Web/src/JavaApiEx/java.i 2012-12-08 14:59:43 UTC (rev 7251)
+++ trunk/MgDev/Web/src/JavaApiEx/java.i 2013-01-12 03:36:03 UTC (rev 7297)
@@ -1,103 +0,0 @@
-//
-// Copyright (C) 2004-2011 by Autodesk, Inc.
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of version 2.1 of the GNU Lesser
-// General Public License as published by the Free Software Foundation.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-//
-
-%typemap(jni) STRINGPARAM "jstring"
-%typemap(jtype) STRINGPARAM "String"
-%typemap(jstype) STRINGPARAM "String"
-%typemap(javain) STRINGPARAM "$javainput"
-%typemap(in) STRINGPARAM
-{
- if($input == NULL)
- $1 = std::wstring(L"");
- else
- {
- int len = jenv->GetStringLength($input);
- const jchar *pstr = jenv->GetStringChars($input, 0);
- if (!pstr)
- $1 = std::wstring(L"ERROR: SWIG string conversion");
- else
- {
-#ifdef WIN32
- $1 = std::wstring((const wchar_t*)pstr, len);
-#else
- xstring u16String = xstring((XMLCh*)pstr, len);
- lstring u32String;
- UnicodeString::UTF16toUTF32(u16String.c_str(),u32String);
- $1 = std::wstring((const wchar_t*) u32String.c_str());
-#endif
- jenv->ReleaseStringChars($input, pstr);
- }
- }
-}
-
-%typemap(jni) STRING "jstring"
-%typemap(jtype) STRING "String"
-%typemap(jstype) STRING "String"
-%typemap(javaout) STRING
-{
- { return $jnicall; }
-}
-%typemap(out) STRING
-{
-#ifdef WIN32
- jresult = jenv->NewString((const jchar *)result.c_str(), (jsize)result.length());
-#else
- xstring u16String;
- UnicodeString::UTF32toUTF16((const LCh*) result.c_str(), u16String);
- jresult = jenv->NewString((const jchar *)u16String.c_str(), (jsize)u16String.length());
-#endif
-}
-
-%typemap(jni) BYTE_ARRAY_IN "jbyteArray"
-%typemap(jtype) BYTE_ARRAY_IN "byte[]"
-%typemap(jstype) BYTE_ARRAY_IN "byte[]"
-%typemap(in) BYTE_ARRAY_IN (jbyte* bytes)
-{
- bytes = jenv->GetByteArrayElements($input, 0);
- if (!bytes)
- return $null;
- $1 = (BYTE_ARRAY_IN)bytes;
-}
-%typemap(freearg) BYTE_ARRAY_IN
-{
- jenv->ReleaseByteArrayElements($input, bytes$argnum, 0);
-}
-%typemap(javain) BYTE_ARRAY_IN "$javainput"
-
-
-%typemap(jni) BYTE_ARRAY_OUT "jbyteArray"
-%typemap(jtype) BYTE_ARRAY_OUT "byte[]"
-%typemap(jstype) BYTE_ARRAY_OUT "byte[]"
-%typemap(in) BYTE_ARRAY_OUT (jbyte* bytes)
-{
- bytes = jenv->GetByteArrayElements($input, 0);
- if (!bytes)
- return $null;
- $1 = (BYTE_ARRAY_OUT)bytes;
-}
-%typemap(freearg) BYTE_ARRAY_OUT
-{
- jenv->ReleaseByteArrayElements($input, bytes$argnum, JNI_COMMIT);
-}
-%typemap(javain) BYTE_ARRAY_OUT "$javainput"
-
-%include "javaextensions.i"
-
-///////////////////////////////////////////////////////////
-// Global functions
-//
-void MgInitializeWebTier(STRINGPARAM configFile);
Copied: trunk/MgDev/Web/src/JavaApiEx/java.i (from rev 7251, sandbox/jng/swig-java/Web/src/JavaApiEx/java.i)
===================================================================
--- trunk/MgDev/Web/src/JavaApiEx/java.i (rev 0)
+++ trunk/MgDev/Web/src/JavaApiEx/java.i 2013-01-12 03:36:03 UTC (rev 7297)
@@ -0,0 +1,103 @@
+//
+// Copyright (C) 2004-2011 by Autodesk, Inc.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of version 2.1 of the GNU Lesser
+// General Public License as published by the Free Software Foundation.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+
+%typemap(jni) STRINGPARAM "jstring"
+%typemap(jtype) STRINGPARAM "String"
+%typemap(jstype) STRINGPARAM "String"
+%typemap(javain) STRINGPARAM "$javainput"
+%typemap(in) STRINGPARAM
+{
+ if($input == NULL)
+ $1 = std::wstring(L"");
+ else
+ {
+ int len = jenv->GetStringLength($input);
+ const jchar *pstr = jenv->GetStringChars($input, 0);
+ if (!pstr)
+ $1 = std::wstring(L"ERROR: SWIG string conversion");
+ else
+ {
+#ifdef WIN32
+ $1 = std::wstring((const wchar_t*)pstr, len);
+#else
+ xstring u16String = xstring((XMLCh*)pstr, len);
+ lstring u32String;
+ UnicodeString::UTF16toUTF32(u16String.c_str(),u32String);
+ $1 = std::wstring((const wchar_t*) u32String.c_str());
+#endif
+ jenv->ReleaseStringChars($input, pstr);
+ }
+ }
+}
+
+%typemap(jni) STRING "jstring"
+%typemap(jtype) STRING "String"
+%typemap(jstype) STRING "String"
+%typemap(javaout) STRING
+{
+ { return $jnicall; }
+}
+%typemap(out) STRING
+{
+#ifdef WIN32
+ jresult = jenv->NewString((const jchar *)result.c_str(), (jsize)result.length());
+#else
+ xstring u16String;
+ UnicodeString::UTF32toUTF16((const LCh*) result.c_str(), u16String);
+ jresult = jenv->NewString((const jchar *)u16String.c_str(), (jsize)u16String.length());
+#endif
+}
+
+%typemap(jni) BYTE_ARRAY_IN "jbyteArray"
+%typemap(jtype) BYTE_ARRAY_IN "byte[]"
+%typemap(jstype) BYTE_ARRAY_IN "byte[]"
+%typemap(in) BYTE_ARRAY_IN (jbyte* bytes)
+{
+ bytes = jenv->GetByteArrayElements($input, 0);
+ if (!bytes)
+ return $null;
+ $1 = (BYTE_ARRAY_IN)bytes;
+}
+%typemap(freearg) BYTE_ARRAY_IN
+{
+ jenv->ReleaseByteArrayElements($input, bytes$argnum, 0);
+}
+%typemap(javain) BYTE_ARRAY_IN "$javainput"
+
+
+%typemap(jni) BYTE_ARRAY_OUT "jbyteArray"
+%typemap(jtype) BYTE_ARRAY_OUT "byte[]"
+%typemap(jstype) BYTE_ARRAY_OUT "byte[]"
+%typemap(in) BYTE_ARRAY_OUT (jbyte* bytes)
+{
+ bytes = jenv->GetByteArrayElements($input, 0);
+ if (!bytes)
+ return $null;
+ $1 = (BYTE_ARRAY_OUT)bytes;
+}
+%typemap(freearg) BYTE_ARRAY_OUT
+{
+ jenv->ReleaseByteArrayElements($input, bytes$argnum, JNI_COMMIT);
+}
+%typemap(javain) BYTE_ARRAY_OUT "$javainput"
+
+%include "javaextensions.i"
+
+///////////////////////////////////////////////////////////
+// Global functions
+//
+void MgInitializeWebTier(STRINGPARAM configFile);
Deleted: trunk/MgDev/Web/src/JavaApiEx/javaextensions.i
===================================================================
--- sandbox/jng/swig-java/Web/src/JavaApiEx/javaextensions.i 2012-12-08 14:59:43 UTC (rev 7251)
+++ trunk/MgDev/Web/src/JavaApiEx/javaextensions.i 2013-01-12 03:36:03 UTC (rev 7297)
@@ -1,345 +0,0 @@
-//
-// Copyright (C) 2004-2011 by Autodesk, Inc.
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of version 2.1 of the GNU Lesser
-// General Public License as published by the Free Software Foundation.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-//
-
-//---------------------- Java interface decorations ------------------------------//
-
-//NOTE: If we're eventually targeting JDK7, change to AutoCloseable for automatic try-with-resources syntax support
-//%typemap(javainterfaces) MgReader "java.io.Closeable"
-//%typemap(javainterfaces) MgFeatureReader "java.io.Closeable"
-//%typemap(javainterfaces) MgDataReader "java.io.Closeable"
-//%typemap(javainterfaces) MgSqlDataReader "java.io.Closeable"
-//%typemap(javainterfaces) MgLongTransactionReader "java.io.Closeable"
-//%typemap(javainterfaces) MgSpatialContextReader "java.io.Closeable"
-
-//---------------------- Renames to avoid Java/C++ API clashes ---------------------------//
-
-//Already defined in Java Exception so rename our proxy method
-%rename(getExceptionStackTrace) MgException::GetStackTrace;
-
-//delete() is the name of the standard SWIG release method called on finalize(). Unfortunately this conflicts with
-//MgPropertyDefinition::Delete, MgClassDefinition::Delete and MgFeatureSchema::Delete when java proxy clases for these
-//classes are generated
-//
-//So rename the java proxies to these methods. This is the most minimally destructive change of all the available options
-//available to us
-%rename(markAsDeleted) MgPropertyDefinition::Delete;
-%rename(markAsDeleted) MgClassDefinition::Delete;
-%rename(markAsDeleted) MgFeatureSchema::Delete;
-
-//If we want to implement java.util.Collection, we need to rename this incompatible API (as add() is expected to
-//return boolean in the java.util.Collection API)
-%rename(addItem) MgBatchPropertyCollection::Add;
-%rename(addItem) MgClassDefinitionCollection::Add;
-%rename(addItem) MgFeatureSchemaCollection::Add;
-%rename(addItem) MgPropertyDefinitionCollection::Add;
-%rename(addItem) MgIntCollection::Add;
-%rename(addItem) MgPropertyCollection::Add;
-%rename(addItem) MgStringCollection::Add;
-%rename(addItem) MgLayerCollection::Add;
-%rename(addItem) MgLayerGroupCollection::Add;
-
-//This is a helper macro to implement the required APIs for collection items
-//
-//This could possibly apply to all proxy classes, but for now we're only interested in classes
-//that are part of any collection class that implements java.util.Collection. This is needed for
-//contains() and other container tests for equality to work
-//
-//Implementation borrowed from OGR swig java bindings
-%define IMPLEMENT_MG_ITEM_API(item_type)
-
-%typemap(javacode) item_type %{
- public boolean equals(Object obj) {
- boolean equal=false;
- if(obj instanceof $javaclassname)
- equal=((($javaclassname)obj).swigCPtr==this.swigCPtr);
- return equal;
- }
-
- public int hashCode() {
- return (int)swigCPtr;
- }
-%}
-
-%enddef
-
-//This is a helper macro to implement the bulk of the java.util.Collection interface for any proxy class
-//that needs one
-//
-//Kinda like C++ templates for Java without the suck. And we all know how much Java generics suck :D
-//
-//TODO: Not sure if a SWIG macro can call into another SWIG macro, but if it can it should call into
-//the IMPLEMENT_MG_JAVA_ITERABLE_API
-%define IMPLEMENT_MG_JAVA_COLLECTION_API(collection_type, item_type)
-//Necessary imports
-%typemap(javaimports) collection_type %{
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.ArrayList;
-import java.util.NoSuchElementException;
-%}
-//Java Interfaces implemented by the java proxy class
-%typemap(javainterfaces) collection_type "Collection<item_type>"
-//This is the java.util.Collection implementation that is injected into each java proxy class
-%typemap(javacode) collection_type %{
- /**
- * An iterator to iterate over this collection
- */
- class ItemIterator implements Iterator<item_type> {
- private collection_type _collection;
- private int _pos;
- private int _count;
-
- public ItemIterator(collection_type c) {
- _collection = c;
- _count = _collection.getCount();
- _pos = -1;
- }
-
- /**
- * Returns true if the iteration has more elements
- */
- public boolean hasNext() {
- return _pos + 1 < _count;
- }
-
- /**
- * Returns the next item_type in the collection
- */
- public item_type next() {
- _pos++;
- if (_pos >= _count)
- throw new NoSuchElementException();
- return _collection.getItem(_pos);
- }
-
- /**
- * Removes from the underlying collection the last element returned by the iterator (not supported).
- */
- public void remove() {
- throw new UnsupportedOperationException();
- }
- }
-
- /**
- * Returns an iterator over the elements in this collection.
- */
- public Iterator<item_type> iterator() { return new ItemIterator(this); }
-
- /**
- * Ensures that this collection contains the specified element (optional operation).
- */
- public boolean add(item_type item) {
- this.addItem(item);
- return true;
- }
-
- /**
- * Adds all of the elements in the specified collection to this collection (optional operation).
- */
- public boolean addAll(Collection<? extends item_type> c) {
- int added = 0;
- for (item_type item : c) {
- this.addItem(item);
- added++;
- }
- return added > 0;
- }
-
- /**
- * Returns true if this collection contains the specified element.
- */
- public boolean contains(Object o) {
- if (o instanceof item_type) {
- return this.contains((item_type)o);
- }
- return false;
- }
-
- /**
- * Returns true if this collection contains all of the elements in the specified collection.
- */
- public boolean containsAll(Collection<?> c) {
- for (Object o : c) {
- if (!this.contains(o))
- return false;
- }
- return true;
- }
-
- /**
- * Returns true if this collection contains no elements.
- */
- public boolean isEmpty() { return this.getCount() == 0; }
-
- /**
- * Removes a single instance of the specified element from this collection, if it is present (optional operation).
- */
- public boolean remove(Object o) {
- if (o instanceof item_type) {
- return this.remove((item_type)o);
- }
- return false;
- }
-
- /**
- * Removes all of this collection's elements that are also contained in the specified collection (optional operation).
- */
- public boolean removeAll(Collection<?> c) {
- int removed = 0;
- for (Object o : c) {
- if (this.remove(o))
- removed++;
- }
- return removed > 0;
- }
-
- /**
- * Retains only the elements in this collection that are contained in the specified collection (optional operation).
- */
- public boolean retainAll(Collection<?> c) {
- int removed = 0;
- ArrayList<item_type> remove = new ArrayList<item_type>();
- for (int i = 0; i < this.getCount(); i++) {
- item_type item = this.getItem(i);
- if (!c.contains(item))
- remove.add(item);
- }
- if (remove.size() > 0) {
- return this.removeAll(remove);
- } else {
- return false;
- }
- }
-
- /**
- * Returns the number of elements in this collection.
- */
- public int size() { return this.getCount(); }
-
- /**
- * Returns an array containing all of the elements in this collection.
- */
- public Object[] toArray() {
- int count = this.getCount();
- Object[] items = new Object[count];
- for (int i = 0; i < count; i++) {
- items[i] = this.getItem(i);
- }
- return items;
- }
-
- /**
- * Returns an array containing all of the elements in this collection; the runtime type of the returned array is that of the specified array.
- */
- public <item_type> item_type[] toArray(item_type[] a) {
- Object[] items = this.toArray();
- if (a.length >= items.length) {
- for (int i = 0; i < items.length; i++) {
- a[i] = (item_type)items[i];
- }
- for (int i = items.length; i < a.length; i++) {
- a[i] = null;
- }
- return a;
- } else {
- item_type[] retVal = (item_type[])java.lang.reflect.Array.newInstance(a.getClass().getComponentType(), items.length);
- for (int i = 0; i < retVal.length; i++) {
- retVal[i] = (item_type)items[i];
- }
- return retVal;
- }
- }
-
-%}
-%enddef
-
-//This helper macro implements the java.lang.Iterable API allowing the instance of the
-//java proxy to be used in an enhanced for loop (akin to IEnumerable/foreach in C#)
-%define IMPLEMENT_MG_JAVA_ITERABLE_API(collection_type, item_type)
-//Necessary imports
-%typemap(javaimports) collection_type %{
-import java.util.Iterator;
-import java.util.NoSuchElementException;
-%}
-//Java Interfaces implemented by the java proxy class
-%typemap(javainterfaces) collection_type "java.lang.Iterable<item_type>"
-//This is the java.lang.Iterable<T> implementation that is injected into each java proxy class
-%typemap(javacode) collection_type %{
- /**
- * An iterator to iterate over this collection
- */
- class ItemIterator implements Iterator<item_type> {
- private collection_type _collection;
- private int _pos;
- private int _count;
-
- public ItemIterator(collection_type c) {
- _collection = c;
- _count = _collection.getCount();
- _pos = -1;
- }
-
- /**
- * Returns true if the iteration has more elements
- */
- public boolean hasNext() {
- return _pos + 1 < _count;
- }
-
- /**
- * Returns the next item_type in the collection
- */
- public item_type next() {
- _pos++;
- if (_pos >= _count)
- throw new NoSuchElementException();
- return _collection.getItem(_pos);
- }
-
- /**
- * Removes from the underlying collection the last element returned by the iterator (not supported).
- */
- public void remove() {
- throw new UnsupportedOperationException();
- }
- }
-
- /**
- * Returns an iterator over the elements in this collection.
- */
- public Iterator<item_type> iterator() { return new ItemIterator(this); }
-
-%}
-%enddef
-
-//Plug the stock implementation for our MapGuide collection and item classes
-IMPLEMENT_MG_ITEM_API(MgClassDefinition)
-IMPLEMENT_MG_ITEM_API(MgFeatureSchema)
-IMPLEMENT_MG_ITEM_API(MgPropertyDefinition)
-IMPLEMENT_MG_ITEM_API(MgProperty)
-IMPLEMENT_MG_ITEM_API(MgLayerBase)
-IMPLEMENT_MG_ITEM_API(MgLayerGroup)
-
-//IMPLEMENT_MG_JAVA_COLLECTION_API(MgBatchPropertyCollection, MgPropertyCollection)
-IMPLEMENT_MG_JAVA_COLLECTION_API(MgClassDefinitionCollection, MgClassDefinition)
-IMPLEMENT_MG_JAVA_COLLECTION_API(MgFeatureSchemaCollection, MgFeatureSchema)
-IMPLEMENT_MG_JAVA_COLLECTION_API(MgPropertyDefinitionCollection, MgPropertyDefinition)
-IMPLEMENT_MG_JAVA_COLLECTION_API(MgPropertyCollection, MgProperty)
-IMPLEMENT_MG_JAVA_COLLECTION_API(MgStringCollection, String)
-IMPLEMENT_MG_JAVA_COLLECTION_API(MgLayerCollection, MgLayerBase)
-IMPLEMENT_MG_JAVA_COLLECTION_API(MgLayerGroupCollection, MgLayerGroup)
-IMPLEMENT_MG_JAVA_ITERABLE_API(MgReadOnlyLayerCollection, MgLayerBase)
\ No newline at end of file
Copied: trunk/MgDev/Web/src/JavaApiEx/javaextensions.i (from rev 7251, sandbox/jng/swig-java/Web/src/JavaApiEx/javaextensions.i)
===================================================================
--- trunk/MgDev/Web/src/JavaApiEx/javaextensions.i (rev 0)
+++ trunk/MgDev/Web/src/JavaApiEx/javaextensions.i 2013-01-12 03:36:03 UTC (rev 7297)
@@ -0,0 +1,345 @@
+//
+// Copyright (C) 2004-2011 by Autodesk, Inc.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of version 2.1 of the GNU Lesser
+// General Public License as published by the Free Software Foundation.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+
+//---------------------- Java interface decorations ------------------------------//
+
+//NOTE: If we're eventually targeting JDK7, change to AutoCloseable for automatic try-with-resources syntax support
+//%typemap(javainterfaces) MgReader "java.io.Closeable"
+//%typemap(javainterfaces) MgFeatureReader "java.io.Closeable"
+//%typemap(javainterfaces) MgDataReader "java.io.Closeable"
+//%typemap(javainterfaces) MgSqlDataReader "java.io.Closeable"
+//%typemap(javainterfaces) MgLongTransactionReader "java.io.Closeable"
+//%typemap(javainterfaces) MgSpatialContextReader "java.io.Closeable"
+
+//---------------------- Renames to avoid Java/C++ API clashes ---------------------------//
+
+//Already defined in Java Exception so rename our proxy method
+%rename(getExceptionStackTrace) MgException::GetStackTrace;
+
+//delete() is the name of the standard SWIG release method called on finalize(). Unfortunately this conflicts with
+//MgPropertyDefinition::Delete, MgClassDefinition::Delete and MgFeatureSchema::Delete when java proxy clases for these
+//classes are generated
+//
+//So rename the java proxies to these methods. This is the most minimally destructive change of all the available options
+//available to us
+%rename(markAsDeleted) MgPropertyDefinition::Delete;
+%rename(markAsDeleted) MgClassDefinition::Delete;
+%rename(markAsDeleted) MgFeatureSchema::Delete;
+
+//If we want to implement java.util.Collection, we need to rename this incompatible API (as add() is expected to
+//return boolean in the java.util.Collection API)
+%rename(addItem) MgBatchPropertyCollection::Add;
+%rename(addItem) MgClassDefinitionCollection::Add;
+%rename(addItem) MgFeatureSchemaCollection::Add;
+%rename(addItem) MgPropertyDefinitionCollection::Add;
+%rename(addItem) MgIntCollection::Add;
+%rename(addItem) MgPropertyCollection::Add;
+%rename(addItem) MgStringCollection::Add;
+%rename(addItem) MgLayerCollection::Add;
+%rename(addItem) MgLayerGroupCollection::Add;
+
+//This is a helper macro to implement the required APIs for collection items
+//
+//This could possibly apply to all proxy classes, but for now we're only interested in classes
+//that are part of any collection class that implements java.util.Collection. This is needed for
+//contains() and other container tests for equality to work
+//
+//Implementation borrowed from OGR swig java bindings
+%define IMPLEMENT_MG_ITEM_API(item_type)
+
+%typemap(javacode) item_type %{
+ public boolean equals(Object obj) {
+ boolean equal=false;
+ if(obj instanceof $javaclassname)
+ equal=((($javaclassname)obj).swigCPtr==this.swigCPtr);
+ return equal;
+ }
+
+ public int hashCode() {
+ return (int)swigCPtr;
+ }
+%}
+
+%enddef
+
+//This is a helper macro to implement the bulk of the java.util.Collection interface for any proxy class
+//that needs one
+//
+//Kinda like C++ templates for Java without the suck. And we all know how much Java generics suck :D
+//
+//TODO: Not sure if a SWIG macro can call into another SWIG macro, but if it can it should call into
+//the IMPLEMENT_MG_JAVA_ITERABLE_API
+%define IMPLEMENT_MG_JAVA_COLLECTION_API(collection_type, item_type)
+//Necessary imports
+%typemap(javaimports) collection_type %{
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.ArrayList;
+import java.util.NoSuchElementException;
+%}
+//Java Interfaces implemented by the java proxy class
+%typemap(javainterfaces) collection_type "Collection<item_type>"
+//This is the java.util.Collection implementation that is injected into each java proxy class
+%typemap(javacode) collection_type %{
+ /**
+ * An iterator to iterate over this collection
+ */
+ class ItemIterator implements Iterator<item_type> {
+ private collection_type _collection;
+ private int _pos;
+ private int _count;
+
+ public ItemIterator(collection_type c) {
+ _collection = c;
+ _count = _collection.getCount();
+ _pos = -1;
+ }
+
+ /**
+ * Returns true if the iteration has more elements
+ */
+ public boolean hasNext() {
+ return _pos + 1 < _count;
+ }
+
+ /**
+ * Returns the next item_type in the collection
+ */
+ public item_type next() {
+ _pos++;
+ if (_pos >= _count)
+ throw new NoSuchElementException();
+ return _collection.getItem(_pos);
+ }
+
+ /**
+ * Removes from the underlying collection the last element returned by the iterator (not supported).
+ */
+ public void remove() {
+ throw new UnsupportedOperationException();
+ }
+ }
+
+ /**
+ * Returns an iterator over the elements in this collection.
+ */
+ public Iterator<item_type> iterator() { return new ItemIterator(this); }
+
+ /**
+ * Ensures that this collection contains the specified element (optional operation).
+ */
+ public boolean add(item_type item) {
+ this.addItem(item);
+ return true;
+ }
+
+ /**
+ * Adds all of the elements in the specified collection to this collection (optional operation).
+ */
+ public boolean addAll(Collection<? extends item_type> c) {
+ int added = 0;
+ for (item_type item : c) {
+ this.addItem(item);
+ added++;
+ }
+ return added > 0;
+ }
+
+ /**
+ * Returns true if this collection contains the specified element.
+ */
+ public boolean contains(Object o) {
+ if (o instanceof item_type) {
+ return this.contains((item_type)o);
+ }
+ return false;
+ }
+
+ /**
+ * Returns true if this collection contains all of the elements in the specified collection.
+ */
+ public boolean containsAll(Collection<?> c) {
+ for (Object o : c) {
+ if (!this.contains(o))
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * Returns true if this collection contains no elements.
+ */
+ public boolean isEmpty() { return this.getCount() == 0; }
+
+ /**
+ * Removes a single instance of the specified element from this collection, if it is present (optional operation).
+ */
+ public boolean remove(Object o) {
+ if (o instanceof item_type) {
+ return this.remove((item_type)o);
+ }
+ return false;
+ }
+
+ /**
+ * Removes all of this collection's elements that are also contained in the specified collection (optional operation).
+ */
+ public boolean removeAll(Collection<?> c) {
+ int removed = 0;
+ for (Object o : c) {
+ if (this.remove(o))
+ removed++;
+ }
+ return removed > 0;
+ }
+
+ /**
+ * Retains only the elements in this collection that are contained in the specified collection (optional operation).
+ */
+ public boolean retainAll(Collection<?> c) {
+ int removed = 0;
+ ArrayList<item_type> remove = new ArrayList<item_type>();
+ for (int i = 0; i < this.getCount(); i++) {
+ item_type item = this.getItem(i);
+ if (!c.contains(item))
+ remove.add(item);
+ }
+ if (remove.size() > 0) {
+ return this.removeAll(remove);
+ } else {
+ return false;
+ }
+ }
+
+ /**
+ * Returns the number of elements in this collection.
+ */
+ public int size() { return this.getCount(); }
+
+ /**
+ * Returns an array containing all of the elements in this collection.
+ */
+ public Object[] toArray() {
+ int count = this.getCount();
+ Object[] items = new Object[count];
+ for (int i = 0; i < count; i++) {
+ items[i] = this.getItem(i);
+ }
+ return items;
+ }
+
+ /**
+ * Returns an array containing all of the elements in this collection; the runtime type of the returned array is that of the specified array.
+ */
+ public <item_type> item_type[] toArray(item_type[] a) {
+ Object[] items = this.toArray();
+ if (a.length >= items.length) {
+ for (int i = 0; i < items.length; i++) {
+ a[i] = (item_type)items[i];
+ }
+ for (int i = items.length; i < a.length; i++) {
+ a[i] = null;
+ }
+ return a;
+ } else {
+ item_type[] retVal = (item_type[])java.lang.reflect.Array.newInstance(a.getClass().getComponentType(), items.length);
+ for (int i = 0; i < retVal.length; i++) {
+ retVal[i] = (item_type)items[i];
+ }
+ return retVal;
+ }
+ }
+
+%}
+%enddef
+
+//This helper macro implements the java.lang.Iterable API allowing the instance of the
+//java proxy to be used in an enhanced for loop (akin to IEnumerable/foreach in C#)
+%define IMPLEMENT_MG_JAVA_ITERABLE_API(collection_type, item_type)
+//Necessary imports
+%typemap(javaimports) collection_type %{
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+%}
+//Java Interfaces implemented by the java proxy class
+%typemap(javainterfaces) collection_type "java.lang.Iterable<item_type>"
+//This is the java.lang.Iterable<T> implementation that is injected into each java proxy class
+%typemap(javacode) collection_type %{
+ /**
+ * An iterator to iterate over this collection
+ */
+ class ItemIterator implements Iterator<item_type> {
+ private collection_type _collection;
+ private int _pos;
+ private int _count;
+
+ public ItemIterator(collection_type c) {
+ _collection = c;
+ _count = _collection.getCount();
+ _pos = -1;
+ }
+
+ /**
+ * Returns true if the iteration has more elements
+ */
+ public boolean hasNext() {
+ return _pos + 1 < _count;
+ }
+
+ /**
+ * Returns the next item_type in the collection
+ */
+ public item_type next() {
+ _pos++;
+ if (_pos >= _count)
+ throw new NoSuchElementException();
+ return _collection.getItem(_pos);
+ }
+
+ /**
+ * Removes from the underlying collection the last element returned by the iterator (not supported).
+ */
+ public void remove() {
+ throw new UnsupportedOperationException();
+ }
+ }
+
+ /**
+ * Returns an iterator over the elements in this collection.
+ */
+ public Iterator<item_type> iterator() { return new ItemIterator(this); }
+
+%}
+%enddef
+
+//Plug the stock implementation for our MapGuide collection and item classes
+IMPLEMENT_MG_ITEM_API(MgClassDefinition)
+IMPLEMENT_MG_ITEM_API(MgFeatureSchema)
+IMPLEMENT_MG_ITEM_API(MgPropertyDefinition)
+IMPLEMENT_MG_ITEM_API(MgProperty)
+IMPLEMENT_MG_ITEM_API(MgLayerBase)
+IMPLEMENT_MG_ITEM_API(MgLayerGroup)
+
+//IMPLEMENT_MG_JAVA_COLLECTION_API(MgBatchPropertyCollection, MgPropertyCollection)
+IMPLEMENT_MG_JAVA_COLLECTION_API(MgClassDefinitionCollection, MgClassDefinition)
+IMPLEMENT_MG_JAVA_COLLECTION_API(MgFeatureSchemaCollection, MgFeatureSchema)
+IMPLEMENT_MG_JAVA_COLLECTION_API(MgPropertyDefinitionCollection, MgPropertyDefinition)
+IMPLEMENT_MG_JAVA_COLLECTION_API(MgPropertyCollection, MgProperty)
+IMPLEMENT_MG_JAVA_COLLECTION_API(MgStringCollection, String)
+IMPLEMENT_MG_JAVA_COLLECTION_API(MgLayerCollection, MgLayerBase)
+IMPLEMENT_MG_JAVA_COLLECTION_API(MgLayerGroupCollection, MgLayerGroup)
+IMPLEMENT_MG_JAVA_ITERABLE_API(MgReadOnlyLayerCollection, MgLayerBase)
\ No newline at end of file
Property changes on: trunk/MgDev/Web/src/JavaApiEx/org
___________________________________________________________________
Added: bugtraq:number
+ true
Property changes on: trunk/MgDev/Web/src/JavaApiEx/org/osgeo
___________________________________________________________________
Added: bugtraq:number
+ true
Property changes on: trunk/MgDev/Web/src/JavaApiEx/org/osgeo/mapguide
___________________________________________________________________
Added: bugtraq:number
+ true
Deleted: trunk/MgDev/Web/src/JavaApiEx/org/osgeo/mapguide/AppThrowable.java
===================================================================
--- sandbox/jng/swig-java/Web/src/JavaApiEx/org/osgeo/mapguide/AppThrowable.java 2012-12-08 14:59:43 UTC (rev 7251)
+++ trunk/MgDev/Web/src/JavaApiEx/org/osgeo/mapguide/AppThrowable.java 2013-01-12 03:36:03 UTC (rev 7297)
@@ -1,57 +0,0 @@
-//
-// Copyright (C) 2004-2011 by Autodesk, Inc.
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of version 2.1 of the GNU Lesser
-// General Public License as published by the Free Software Foundation.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-//
-
-package org.osgeo.mapguide;
-
-class AppThrowable extends RuntimeException
-{
- public AppThrowable()
- {
- }
-
- public AppThrowable(long cPtr, boolean cMemoryOwn)
- {
- }
-
- public String getMessage()
- {
- try
- {
- return ((MgException)this).getExceptionMessage();
- }
- catch (MgException e)
- {
- return "";
- }
- }
-
- public void printStackTrace()
- {
- try
- {
- System.out.println(((MgException)this).getExceptionStackTrace());
- }
- catch (MgException e)
- {
- }
- }
-
- public void delete()
- {
- //implemented by derived classes
- }
-}
Copied: trunk/MgDev/Web/src/JavaApiEx/org/osgeo/mapguide/AppThrowable.java (from rev 7251, sandbox/jng/swig-java/Web/src/JavaApiEx/org/osgeo/mapguide/AppThrowable.java)
===================================================================
--- trunk/MgDev/Web/src/JavaApiEx/org/osgeo/mapguide/AppThrowable.java (rev 0)
+++ trunk/MgDev/Web/src/JavaApiEx/org/osgeo/mapguide/AppThrowable.java 2013-01-12 03:36:03 UTC (rev 7297)
@@ -0,0 +1,57 @@
+//
+// Copyright (C) 2004-2011 by Autodesk, Inc.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of version 2.1 of the GNU Lesser
+// General Public License as published by the Free Software Foundation.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+
+package org.osgeo.mapguide;
+
+class AppThrowable extends RuntimeException
+{
+ public AppThrowable()
+ {
+ }
+
+ public AppThrowable(long cPtr, boolean cMemoryOwn)
+ {
+ }
+
+ public String getMessage()
+ {
+ try
+ {
+ return ((MgException)this).getExceptionMessage();
+ }
+ catch (MgException e)
+ {
+ return "";
+ }
+ }
+
+ public void printStackTrace()
+ {
+ try
+ {
+ System.out.println(((MgException)this).getExceptionStackTrace());
+ }
+ catch (MgException e)
+ {
+ }
+ }
+
+ public void delete()
+ {
+ //implemented by derived classes
+ }
+}
Deleted: trunk/MgDev/Web/src/JavaApiEx/org/osgeo/mapguide/MgBase64.java
===================================================================
--- sandbox/jng/swig-java/Web/src/JavaApiEx/org/osgeo/mapguide/MgBase64.java 2012-12-08 14:59:43 UTC (rev 7251)
+++ trunk/MgDev/Web/src/JavaApiEx/org/osgeo/mapguide/MgBase64.java 2013-01-12 03:36:03 UTC (rev 7297)
@@ -1,1469 +0,0 @@
-//
-// Copyright (C) 2004-2011 by Autodesk, Inc.
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of version 2.1 of the GNU Lesser
-// General Public License as published by the Free Software Foundation.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-//
-
-/**
- * Encodes and decodes to and from Base64 notation.
- *
- * <p>
- * Change Log:
- * </p>
- * <ul>
- * <li>v2.1 - Cleaned up javadoc comments and unused variables and methods. Added
- * some convenience methods for reading and writing to and from files.</li>
- * <li>v2.0.2 - Now specifies UTF-8 encoding in places where the code fails on systems
- * with other encodings (like EBCDIC).</li>
- * <li>v2.0.1 - Fixed an error when decoding a single byte, that is, when the
- * encoded data was a single byte.</li>
- * <li>v2.0 - I got rid of methods that used booleans to set options.
- * Now everything is more consolidated and cleaner. The code now detects
- * when data that's being decoded is gzip-compressed and will decompress it
- * automatically. Generally things are cleaner. You'll probably have to
- * change some method calls that you were making to support the new
- * options format (<tt>int</tt>s that you "OR" together).</li>
- * <li>v1.5.1 - Fixed bug when decompressing and decoding to a
- * byte[] using <tt>decode( String s, boolean gzipCompressed )</tt>.
- * Added the ability to "suspend" encoding in the Output Stream so
- * you can turn on and off the encoding if you need to embed base64
- * data in an otherwise "normal" stream (like an XML file).</li>
- * <li>v1.5 - Output stream pases on flush() command but doesn't do anything itself.
- * This helps when using GZIP streams.
- * Added the ability to GZip-compress objects before encoding them.</li>
- * <li>v1.4 - Added helper methods to read/write files.</li>
- * <li>v1.3.6 - Fixed OutputStream.flush() so that 'position' is reset.</li>
- * <li>v1.3.5 - Added flag to turn on and off line breaks. Fixed bug in input stream
- * where last buffer being read, if not completely full, was not returned.</li>
- * <li>v1.3.4 - Fixed when "improperly padded stream" error was thrown at the wrong time.</li>
- * <li>v1.3.3 - Fixed I/O streams which were totally messed up.</li>
- * </ul>
- *
- * <p>
- * I am placing this code in the Public Domain. Do with it as you will.
- * This software comes with no guarantees or warranties but with
- * plenty of well-wishing instead!
- * Please visit <a href="http://iharder.net/base64">http://iharder.net/base64</a>
- * periodically to check for updates or to contribute improvements.
- * </p>
- *
- * @author Robert Harder
- * @author rob at iharder.net
- * @version 2.1
- */
-
-package org.osgeo.mapguide;
-
-public class MgBase64
-{
-
-/* ******** P U B L I C F I E L D S ******** */
-
-
- /** No options specified. Value is zero. */
- public final static int NO_OPTIONS = 0;
-
- /** Specify encoding. */
- public final static int ENCODE = 1;
-
-
- /** Specify decoding. */
- public final static int DECODE = 0;
-
-
- /** Specify that data should be gzip-compressed. */
- public final static int GZIP = 2;
-
-
- /** Don't break lines when encoding (violates strict Base64 specification) */
- public final static int DONT_BREAK_LINES = 8;
-
-
-/* ******** P R I V A T E F I E L D S ******** */
-
-
- /** Maximum line length (76) of Base64 output. */
- private final static int MAX_LINE_LENGTH = 76;
-
-
- /** The equals sign (=) as a byte. */
- private final static byte EQUALS_SIGN = (byte)'=';
-
-
- /** The new line character (\n) as a byte. */
- private final static byte NEW_LINE = (byte)'\n';
-
-
- /** Preferred encoding. */
- private final static String PREFERRED_ENCODING = "UTF-8";
-
-
- /** The 64 valid Base64 values. */
- private final static byte[] ALPHABET;
- private final static byte[] _NATIVE_ALPHABET = /* May be something funny like EBCDIC */
- {
- (byte)'A', (byte)'B', (byte)'C', (byte)'D', (byte)'E', (byte)'F', (byte)'G',
- (byte)'H', (byte)'I', (byte)'J', (byte)'K', (byte)'L', (byte)'M', (byte)'N',
- (byte)'O', (byte)'P', (byte)'Q', (byte)'R', (byte)'S', (byte)'T', (byte)'U',
- (byte)'V', (byte)'W', (byte)'X', (byte)'Y', (byte)'Z',
- (byte)'a', (byte)'b', (byte)'c', (byte)'d', (byte)'e', (byte)'f', (byte)'g',
- (byte)'h', (byte)'i', (byte)'j', (byte)'k', (byte)'l', (byte)'m', (byte)'n',
- (byte)'o', (byte)'p', (byte)'q', (byte)'r', (byte)'s', (byte)'t', (byte)'u',
- (byte)'v', (byte)'w', (byte)'x', (byte)'y', (byte)'z',
- (byte)'0', (byte)'1', (byte)'2', (byte)'3', (byte)'4', (byte)'5',
- (byte)'6', (byte)'7', (byte)'8', (byte)'9', (byte)'+', (byte)'/'
- };
-
- /** Determine which ALPHABET to use. */
- static
- {
- byte[] __bytes;
- try
- {
- __bytes = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".getBytes( PREFERRED_ENCODING );
- } // end try
- catch (java.io.UnsupportedEncodingException use)
- {
- __bytes = _NATIVE_ALPHABET; // Fall back to native encoding
- } // end catch
- ALPHABET = __bytes;
- } // end static
-
-
- /**
- * Translates a Base64 value to either its 6-bit reconstruction value
- * or a negative number indicating some other meaning.
- **/
- private final static byte[] DECODABET =
- {
- -9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 0 - 8
- -5,-5, // Whitespace: Tab and Linefeed
- -9,-9, // Decimal 11 - 12
- -5, // Whitespace: Carriage Return
- -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 14 - 26
- -9,-9,-9,-9,-9, // Decimal 27 - 31
- -5, // Whitespace: Space
- -9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 33 - 42
- 62, // Plus sign at decimal 43
- -9,-9,-9, // Decimal 44 - 46
- 63, // Slash at decimal 47
- 52,53,54,55,56,57,58,59,60,61, // Numbers zero through nine
- -9,-9,-9, // Decimal 58 - 60
- -1, // Equals sign at decimal 61
- -9,-9,-9, // Decimal 62 - 64
- 0,1,2,3,4,5,6,7,8,9,10,11,12,13, // Letters 'A' through 'N'
- 14,15,16,17,18,19,20,21,22,23,24,25, // Letters 'O' through 'Z'
- -9,-9,-9,-9,-9,-9, // Decimal 91 - 96
- 26,27,28,29,30,31,32,33,34,35,36,37,38, // Letters 'a' through 'm'
- 39,40,41,42,43,44,45,46,47,48,49,50,51, // Letters 'n' through 'z'
- -9,-9,-9,-9 // Decimal 123 - 126
- /*,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 127 - 139
- -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 140 - 152
- -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 153 - 165
- -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 166 - 178
- -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 179 - 191
- -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 192 - 204
- -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 205 - 217
- -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 218 - 230
- -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 231 - 243
- -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9 // Decimal 244 - 255 */
- };
-
- // I think I end up not using the BAD_ENCODING indicator.
- //private final static byte BAD_ENCODING = -9; // Indicates error in encoding
- private final static byte WHITE_SPACE_ENC = -5; // Indicates white space in encoding
- private final static byte EQUALS_SIGN_ENC = -1; // Indicates equals sign in encoding
-
-
- /** Defeats instantiation. */
- private MgBase64(){}
-
-
-
-/* ******** E N C O D I N G M E T H O D S ******** */
-
-
- /**
- * Encodes up to the first three bytes of array <var>threeBytes</var>
- * and returns a four-byte array in Base64 notation.
- * The actual number of significant bytes in your array is
- * given by <var>numSigBytes</var>.
- * The array <var>threeBytes</var> needs only be as big as
- * <var>numSigBytes</var>.
- * Code can reuse a byte array by passing a four-byte array as <var>b4</var>.
- *
- * @param b4 A reusable byte array to reduce array instantiation
- * @param threeBytes the array to convert
- * @param numSigBytes the number of significant bytes in your array
- * @return four byte array in Base64 notation.
- * @since 1.5.1
- */
- private static byte[] encode3to4( byte[] b4, byte[] threeBytes, int numSigBytes )
- {
- encode3to4( threeBytes, 0, numSigBytes, b4, 0 );
- return b4;
- } // end encode3to4
-
-
- /**
- * Encodes up to three bytes of the array <var>source</var>
- * and writes the resulting four Base64 bytes to <var>destination</var>.
- * The source and destination arrays can be manipulated
- * anywhere along their length by specifying
- * <var>srcOffset</var> and <var>destOffset</var>.
- * This method does not check to make sure your arrays
- * are large enough to accomodate <var>srcOffset</var> + 3 for
- * the <var>source</var> array or <var>destOffset</var> + 4 for
- * the <var>destination</var> array.
- * The actual number of significant bytes in your array is
- * given by <var>numSigBytes</var>.
- *
- * @param source the array to convert
- * @param srcOffset the index where conversion begins
- * @param numSigBytes the number of significant bytes in your array
- * @param destination the array to hold the conversion
- * @param destOffset the index where output will be put
- * @return the <var>destination</var> array
- * @since 1.3
- */
- private static byte[] encode3to4(
- byte[] source, int srcOffset, int numSigBytes,
- byte[] destination, int destOffset )
- {
- // 1 2 3
- // 01234567890123456789012345678901 Bit position
- // --------000000001111111122222222 Array position from threeBytes
- // --------| || || || | Six bit groups to index ALPHABET
- // >>18 >>12 >> 6 >> 0 Right shift necessary
- // 0x3f 0x3f 0x3f Additional AND
-
- // Create buffer with zero-padding if there are only one or two
- // significant bytes passed in the array.
- // We have to shift left 24 in order to flush out the 1's that appear
- // when Java treats a value as negative that is cast from a byte to an int.
- int inBuff = ( numSigBytes > 0 ? ((source[ srcOffset ] << 24) >>> 8) : 0 )
- | ( numSigBytes > 1 ? ((source[ srcOffset + 1 ] << 24) >>> 16) : 0 )
- | ( numSigBytes > 2 ? ((source[ srcOffset + 2 ] << 24) >>> 24) : 0 );
-
- switch( numSigBytes )
- {
- case 3:
- destination[ destOffset ] = ALPHABET[ (inBuff >>> 18) ];
- destination[ destOffset + 1 ] = ALPHABET[ (inBuff >>> 12) & 0x3f ];
- destination[ destOffset + 2 ] = ALPHABET[ (inBuff >>> 6) & 0x3f ];
- destination[ destOffset + 3 ] = ALPHABET[ (inBuff ) & 0x3f ];
- return destination;
-
- case 2:
- destination[ destOffset ] = ALPHABET[ (inBuff >>> 18) ];
- destination[ destOffset + 1 ] = ALPHABET[ (inBuff >>> 12) & 0x3f ];
- destination[ destOffset + 2 ] = ALPHABET[ (inBuff >>> 6) & 0x3f ];
- destination[ destOffset + 3 ] = EQUALS_SIGN;
- return destination;
-
- case 1:
- destination[ destOffset ] = ALPHABET[ (inBuff >>> 18) ];
- destination[ destOffset + 1 ] = ALPHABET[ (inBuff >>> 12) & 0x3f ];
- destination[ destOffset + 2 ] = EQUALS_SIGN;
- destination[ destOffset + 3 ] = EQUALS_SIGN;
- return destination;
-
- default:
- return destination;
- } // end switch
- } // end encode3to4
-
-
-
- /**
- * Serializes an object and returns the Base64-encoded
- * version of that serialized object. If the object
- * cannot be serialized or there is another error,
- * the method will return <tt>null</tt>.
- * The object is not GZip-compressed before being encoded.
- *
- * @param serializableObject The object to encode
- * @return The Base64-encoded object
- * @since 1.4
- */
- public static String encodeObject( java.io.Serializable serializableObject )
- {
- return encodeObject( serializableObject, NO_OPTIONS );
- } // end encodeObject
-
-
-
- /**
- * Serializes an object and returns the Base64-encoded
- * version of that serialized object. If the object
- * cannot be serialized or there is another error,
- * the method will return <tt>null</tt>.
- * <p>
- * Valid options:<pre>
- * GZIP: gzip-compresses object before encoding it.
- * DONT_BREAK_LINES: don't break lines at 76 characters
- * <i>Note: Technically, this makes your encoding non-compliant.</i>
- * </pre>
- * <p>
- * Example: <code>encodeObject( myObj, Base64.GZIP )</code> or
- * <p>
- * Example: <code>encodeObject( myObj, Base64.GZIP | Base64.DONT_BREAK_LINES )</code>
- *
- * @param serializableObject The object to encode
- * @param options Specified options
- * @return The Base64-encoded object
- * @see Base64#GZIP
- * @see Base64#DONT_BREAK_LINES
- * @since 2.0
- */
- public static String encodeObject( java.io.Serializable serializableObject, int options )
- {
- // Streams
- java.io.ByteArrayOutputStream baos = null;
- java.io.OutputStream b64os = null;
- java.io.ObjectOutputStream oos = null;
- java.util.zip.GZIPOutputStream gzos = null;
-
- // Isolate options
- int gzip = (options & GZIP);
- int dontBreakLines = (options & DONT_BREAK_LINES);
-
- try
- {
- // ObjectOutputStream -> (GZIP) -> Base64 -> ByteArrayOutputStream
- baos = new java.io.ByteArrayOutputStream();
- b64os = new MgBase64.OutputStream( baos, ENCODE | dontBreakLines );
-
- // GZip?
- if( gzip == GZIP )
- {
- gzos = new java.util.zip.GZIPOutputStream( b64os );
- oos = new java.io.ObjectOutputStream( gzos );
- } // end if: gzip
- else
- oos = new java.io.ObjectOutputStream( b64os );
-
- oos.writeObject( serializableObject );
- } // end try
- catch( java.io.IOException e )
- {
- e.printStackTrace();
- return null;
- } // end catch
- finally
- {
- try{ oos.close(); } catch( Exception e ){}
- try{ gzos.close(); } catch( Exception e ){}
- try{ b64os.close(); } catch( Exception e ){}
- try{ baos.close(); } catch( Exception e ){}
- } // end finally
-
- // Return value according to relevant encoding.
- try
- {
- return new String( baos.toByteArray(), PREFERRED_ENCODING );
- } // end try
- catch (java.io.UnsupportedEncodingException uue)
- {
- return new String( baos.toByteArray() );
- } // end catch
-
- } // end encode
-
-
-
- /**
- * Encodes a byte array into Base64 notation.
- * Does not GZip-compress data.
- *
- * @param source The data to convert
- * @since 1.4
- */
- public static String encodeBytes( byte[] source )
- {
- return encodeBytes( source, 0, source.length, NO_OPTIONS );
- } // end encodeBytes
-
-
-
- /**
- * Encodes a byte array into Base64 notation.
- * <p>
- * Valid options:<pre>
- * GZIP: gzip-compresses object before encoding it.
- * DONT_BREAK_LINES: don't break lines at 76 characters
- * <i>Note: Technically, this makes your encoding non-compliant.</i>
- * </pre>
- * <p>
- * Example: <code>encodeBytes( myData, Base64.GZIP )</code> or
- * <p>
- * Example: <code>encodeBytes( myData, Base64.GZIP | Base64.DONT_BREAK_LINES )</code>
- *
- *
- * @param source The data to convert
- * @param options Specified options
- * @see Base64#GZIP
- * @see Base64#DONT_BREAK_LINES
- * @since 2.0
- */
- public static String encodeBytes( byte[] source, int options )
- {
- return encodeBytes( source, 0, source.length, options );
- } // end encodeBytes
-
-
- /**
- * Encodes a byte array into Base64 notation.
- * Does not GZip-compress data.
- *
- * @param source The data to convert
- * @param off Offset in array where conversion should begin
- * @param len Length of data to convert
- * @since 1.4
- */
- public static String encodeBytes( byte[] source, int off, int len )
- {
- return encodeBytes( source, off, len, NO_OPTIONS );
- } // end encodeBytes
-
-
-
- /**
- * Encodes a byte array into Base64 notation.
- * <p>
- * Valid options:<pre>
- * GZIP: gzip-compresses object before encoding it.
- * DONT_BREAK_LINES: don't break lines at 76 characters
- * <i>Note: Technically, this makes your encoding non-compliant.</i>
- * </pre>
- * <p>
- * Example: <code>encodeBytes( myData, Base64.GZIP )</code> or
- * <p>
- * Example: <code>encodeBytes( myData, Base64.GZIP | Base64.DONT_BREAK_LINES )</code>
- *
- *
- * @param source The data to convert
- * @param off Offset in array where conversion should begin
- * @param len Length of data to convert
- * @param options Specified options
- * @see Base64#GZIP
- * @see Base64#DONT_BREAK_LINES
- * @since 2.0
- */
- public static String encodeBytes( byte[] source, int off, int len, int options )
- {
- // Isolate options
- int dontBreakLines = ( options & DONT_BREAK_LINES );
- int gzip = ( options & GZIP );
-
- // Compress?
- if( gzip == GZIP )
- {
- java.io.ByteArrayOutputStream baos = null;
- java.util.zip.GZIPOutputStream gzos = null;
- MgBase64.OutputStream b64os = null;
-
-
- try
- {
- // GZip -> Base64 -> ByteArray
- baos = new java.io.ByteArrayOutputStream();
- b64os = new MgBase64.OutputStream( baos, ENCODE | dontBreakLines );
- gzos = new java.util.zip.GZIPOutputStream( b64os );
-
- gzos.write( source, off, len );
- gzos.close();
- } // end try
- catch( java.io.IOException e )
- {
- e.printStackTrace();
- return null;
- } // end catch
- finally
- {
- try{ gzos.close(); } catch( Exception e ){}
- try{ b64os.close(); } catch( Exception e ){}
- try{ baos.close(); } catch( Exception e ){}
- } // end finally
-
- // Return value according to relevant encoding.
- try
- {
- return new String( baos.toByteArray(), PREFERRED_ENCODING );
- } // end try
- catch (java.io.UnsupportedEncodingException uue)
- {
- return new String( baos.toByteArray() );
- } // end catch
- } // end if: compress
-
- // Else, don't compress. Better not to use streams at all then.
- else
- {
- // Convert option to boolean in way that code likes it.
- boolean breakLines = dontBreakLines == 0;
-
- int len43 = len * 4 / 3;
- byte[] outBuff = new byte[ ( len43 ) // Main 4:3
- + ( (len % 3) > 0 ? 4 : 0 ) // Account for padding
- + (breakLines ? ( len43 / MAX_LINE_LENGTH ) : 0) ]; // New lines
- int d = 0;
- int e = 0;
- int len2 = len - 2;
- int lineLength = 0;
- for( ; d < len2; d+=3, e+=4 )
- {
- encode3to4( source, d+off, 3, outBuff, e );
-
- lineLength += 4;
- if( breakLines && lineLength == MAX_LINE_LENGTH )
- {
- outBuff[e+4] = NEW_LINE;
- e++;
- lineLength = 0;
- } // end if: end of line
- } // en dfor: each piece of array
-
- if( d < len )
- {
- encode3to4( source, d+off, len - d, outBuff, e );
- e += 4;
- } // end if: some padding needed
-
-
- // Return value according to relevant encoding.
- try
- {
- return new String( outBuff, 0, e, PREFERRED_ENCODING );
- } // end try
- catch (java.io.UnsupportedEncodingException uue)
- {
- return new String( outBuff, 0, e );
- } // end catch
-
- } // end else: don't compress
-
- } // end encodeBytes
-
-
-
-
-
-/* ******** D E C O D I N G M E T H O D S ******** */
-
-
- /**
- * Decodes four bytes from array <var>source</var>
- * and writes the resulting bytes (up to three of them)
- * to <var>destination</var>.
- * The source and destination arrays can be manipulated
- * anywhere along their length by specifying
- * <var>srcOffset</var> and <var>destOffset</var>.
- * This method does not check to make sure your arrays
- * are large enough to accomodate <var>srcOffset</var> + 4 for
- * the <var>source</var> array or <var>destOffset</var> + 3 for
- * the <var>destination</var> array.
- * This method returns the actual number of bytes that
- * were converted from the Base64 encoding.
- *
- *
- * @param source the array to convert
- * @param srcOffset the index where conversion begins
- * @param destination the array to hold the conversion
- * @param destOffset the index where output will be put
- * @return the number of decoded bytes converted
- * @since 1.3
- */
- private static int decode4to3( byte[] source, int srcOffset, byte[] destination, int destOffset )
- {
- // Example: Dk==
- if( source[ srcOffset + 2] == EQUALS_SIGN )
- {
- // Two ways to do the same thing. Don't know which way I like best.
- //int outBuff = ( ( DECODABET[ source[ srcOffset ] ] << 24 ) >>> 6 )
- // | ( ( DECODABET[ source[ srcOffset + 1] ] << 24 ) >>> 12 );
- int outBuff = ( ( DECODABET[ source[ srcOffset ] ] & 0xFF ) << 18 )
- | ( ( DECODABET[ source[ srcOffset + 1] ] & 0xFF ) << 12 );
-
- destination[ destOffset ] = (byte)( outBuff >>> 16 );
- return 1;
- }
-
- // Example: DkL=
- else if( source[ srcOffset + 3 ] == EQUALS_SIGN )
- {
- // Two ways to do the same thing. Don't know which way I like best.
- //int outBuff = ( ( DECODABET[ source[ srcOffset ] ] << 24 ) >>> 6 )
- // | ( ( DECODABET[ source[ srcOffset + 1 ] ] << 24 ) >>> 12 )
- // | ( ( DECODABET[ source[ srcOffset + 2 ] ] << 24 ) >>> 18 );
- int outBuff = ( ( DECODABET[ source[ srcOffset ] ] & 0xFF ) << 18 )
- | ( ( DECODABET[ source[ srcOffset + 1 ] ] & 0xFF ) << 12 )
- | ( ( DECODABET[ source[ srcOffset + 2 ] ] & 0xFF ) << 6 );
-
- destination[ destOffset ] = (byte)( outBuff >>> 16 );
- destination[ destOffset + 1 ] = (byte)( outBuff >>> 8 );
- return 2;
- }
-
- // Example: DkLE
- else
- {
- try{
- // Two ways to do the same thing. Don't know which way I like best.
- //int outBuff = ( ( DECODABET[ source[ srcOffset ] ] << 24 ) >>> 6 )
- // | ( ( DECODABET[ source[ srcOffset + 1 ] ] << 24 ) >>> 12 )
- // | ( ( DECODABET[ source[ srcOffset + 2 ] ] << 24 ) >>> 18 )
- // | ( ( DECODABET[ source[ srcOffset + 3 ] ] << 24 ) >>> 24 );
- int outBuff = ( ( DECODABET[ source[ srcOffset ] ] & 0xFF ) << 18 )
- | ( ( DECODABET[ source[ srcOffset + 1 ] ] & 0xFF ) << 12 )
- | ( ( DECODABET[ source[ srcOffset + 2 ] ] & 0xFF ) << 6)
- | ( ( DECODABET[ source[ srcOffset + 3 ] ] & 0xFF ) );
-
-
- destination[ destOffset ] = (byte)( outBuff >> 16 );
- destination[ destOffset + 1 ] = (byte)( outBuff >> 8 );
- destination[ destOffset + 2 ] = (byte)( outBuff );
-
- return 3;
- }catch( Exception e){
- System.out.println(""+source[srcOffset]+ ": " + ( DECODABET[ source[ srcOffset ] ] ) );
- System.out.println(""+source[srcOffset+1]+ ": " + ( DECODABET[ source[ srcOffset + 1 ] ] ) );
- System.out.println(""+source[srcOffset+2]+ ": " + ( DECODABET[ source[ srcOffset + 2 ] ] ) );
- System.out.println(""+source[srcOffset+3]+ ": " + ( DECODABET[ source[ srcOffset + 3 ] ] ) );
- return -1;
- } //e nd catch
- }
- } // end decodeToBytes
-
-
-
-
- /**
- * Very low-level access to decoding ASCII characters in
- * the form of a byte array. Does not support automatically
- * gunzipping or any other "fancy" features.
- *
- * @param source The Base64 encoded data
- * @param off The offset of where to begin decoding
- * @param len The length of characters to decode
- * @return decoded data
- * @since 1.3
- */
- public static byte[] decode( byte[] source, int off, int len )
- {
- int len34 = len * 3 / 4;
- byte[] outBuff = new byte[ len34 ]; // Upper limit on size of output
- int outBuffPosn = 0;
-
- byte[] b4 = new byte[4];
- int b4Posn = 0;
- int i = 0;
- byte sbiCrop = 0;
- byte sbiDecode = 0;
- for( i = off; i < off+len; i++ )
- {
- sbiCrop = (byte)(source[i] & 0x7f); // Only the low seven bits
- sbiDecode = DECODABET[ sbiCrop ];
-
- if( sbiDecode >= WHITE_SPACE_ENC ) // White space, Equals sign or better
- {
- if( sbiDecode >= EQUALS_SIGN_ENC )
- {
- b4[ b4Posn++ ] = sbiCrop;
- if( b4Posn > 3 )
- {
- outBuffPosn += decode4to3( b4, 0, outBuff, outBuffPosn );
- b4Posn = 0;
-
- // If that was the equals sign, break out of 'for' loop
- if( sbiCrop == EQUALS_SIGN )
- break;
- } // end if: quartet built
-
- } // end if: equals sign or better
-
- } // end if: white space, equals sign or better
- else
- {
- System.err.println( "Bad Base64 input character at " + i + ": " + source[i] + "(decimal)" );
- return null;
- } // end else:
- } // each input character
-
- byte[] out = new byte[ outBuffPosn ];
- System.arraycopy( outBuff, 0, out, 0, outBuffPosn );
- return out;
- } // end decode
-
-
-
-
- /**
- * Decodes data from Base64 notation, automatically
- * detecting gzip-compressed data and decompressing it.
- *
- * @param s the string to decode
- * @return the decoded data
- * @since 1.4
- */
- public static byte[] decode( String s )
- {
- byte[] bytes;
- try
- {
- bytes = s.getBytes( PREFERRED_ENCODING );
- } // end try
- catch( java.io.UnsupportedEncodingException uee )
- {
- bytes = s.getBytes();
- } // end catch
- //</change>
-
- // Decode
- bytes = decode( bytes, 0, bytes.length );
-
-
- // Check to see if it's gzip-compressed
- // GZIP Magic Two-Byte Number: 0x8b1f (35615)
- if( bytes != null && bytes.length >= 4 )
- {
-
- int head = ((int)bytes[0] & 0xff) | ((bytes[1] << 8) & 0xff00);
- if( java.util.zip.GZIPInputStream.GZIP_MAGIC == head )
- {
- java.io.ByteArrayInputStream bais = null;
- java.util.zip.GZIPInputStream gzis = null;
- java.io.ByteArrayOutputStream baos = null;
- byte[] buffer = new byte[2048];
- int length = 0;
-
- try
- {
- baos = new java.io.ByteArrayOutputStream();
- bais = new java.io.ByteArrayInputStream( bytes );
- gzis = new java.util.zip.GZIPInputStream( bais );
-
- while( ( length = gzis.read( buffer ) ) >= 0 )
- {
- baos.write(buffer,0,length);
- } // end while: reading input
-
- // No error? Get new bytes.
- bytes = baos.toByteArray();
-
- } // end try
- catch( java.io.IOException e )
- {
- // Just return originally-decoded bytes
- } // end catch
- finally
- {
- try{ baos.close(); } catch( Exception e ){}
- try{ gzis.close(); } catch( Exception e ){}
- try{ bais.close(); } catch( Exception e ){}
- } // end finally
-
- } // end if: gzipped
- } // end if: bytes.length >= 2
-
- return bytes;
- } // end decode
-
-
-
-
- /**
- * Attempts to decode Base64 data and deserialize a Java
- * Object within. Returns <tt>null</tt> if there was an error.
- *
- * @param encodedObject The Base64 data to decode
- * @return The decoded and deserialized object
- * @since 1.5
- */
- public static Object decodeToObject( String encodedObject )
- {
- // Decode and gunzip if necessary
- byte[] objBytes = decode( encodedObject );
-
- java.io.ByteArrayInputStream bais = null;
- java.io.ObjectInputStream ois = null;
- Object obj = null;
-
- try
- {
- bais = new java.io.ByteArrayInputStream( objBytes );
- ois = new java.io.ObjectInputStream( bais );
-
- obj = ois.readObject();
- } // end try
- catch( java.io.IOException e )
- {
- e.printStackTrace();
- obj = null;
- } // end catch
- catch( java.lang.ClassNotFoundException e )
- {
- e.printStackTrace();
- obj = null;
- } // end catch
- finally
- {
- try{ bais.close(); } catch( Exception e ){}
- try{ ois.close(); } catch( Exception e ){}
- } // end finally
-
- return obj;
- } // end decodeObject
-
-
-
- /**
- * Convenience method for encoding data to a file.
- *
- * @param dataToEncode byte array of data to encode in base64 form
- * @param filename Filename for saving encoded data
- * @return <tt>true</tt> if successful, <tt>false</tt> otherwise
- *
- * @since 2.1
- */
- public static boolean encodeToFile( byte[] dataToEncode, String filename )
- {
- boolean success = false;
- MgBase64.OutputStream bos = null;
- try
- {
- bos = new MgBase64.OutputStream(
- new java.io.FileOutputStream( filename ), MgBase64.ENCODE );
- bos.write( dataToEncode );
- success = true;
- } // end try
- catch( java.io.IOException e )
- {
-
- success = false;
- } // end catch: IOException
- finally
- {
- try{ bos.close(); } catch( Exception e ){}
- } // end finally
-
- return success;
- } // end encodeToFile
-
-
- /**
- * Convenience method for decoding data to a file.
- *
- * @param dataToDecode Base64-encoded data as a string
- * @param filename Filename for saving decoded data
- * @return <tt>true</tt> if successful, <tt>false</tt> otherwise
- *
- * @since 2.1
- */
- public static boolean decodeToFile( String dataToDecode, String filename )
- {
- boolean success = false;
- MgBase64.OutputStream bos = null;
- try
- {
- bos = new MgBase64.OutputStream(
- new java.io.FileOutputStream( filename ), MgBase64.DECODE );
- bos.write( dataToDecode.getBytes( PREFERRED_ENCODING ) );
- success = true;
- } // end try
- catch( java.io.IOException e )
- {
- success = false;
- } // end catch: IOException
- finally
- {
- try{ bos.close(); } catch( Exception e ){}
- } // end finally
-
- return success;
- } // end decodeToFile
-
-
-
-
- /**
- * Convenience method for reading a base64-encoded
- * file and decoding it.
- *
- * @param filename Filename for reading encoded data
- * @return decoded byte array or null if unsuccessful
- *
- * @since 2.1
- */
- public static byte[] decodeFromFile( String filename )
- {
- byte[] decodedData = null;
- MgBase64.InputStream bis = null;
- try
- {
- // Set up some useful variables
- java.io.File file = new java.io.File( filename );
- byte[] buffer = null;
- int length = 0;
- int numBytes = 0;
-
- // Check for size of file
- if( file.length() > Integer.MAX_VALUE )
- {
- System.err.println( "File is too big for this convenience method (" + file.length() + " bytes)." );
- return null;
- } // end if: file too big for int index
- buffer = new byte[ (int)file.length() ];
-
- // Open a stream
- bis = new MgBase64.InputStream(
- new java.io.BufferedInputStream(
- new java.io.FileInputStream( file ) ), MgBase64.DECODE );
-
- // Read until done
- while( ( numBytes = bis.read( buffer, length, 4096 ) ) >= 0 )
- length += numBytes;
-
- // Save in a variable to return
- decodedData = new byte[ length ];
- System.arraycopy( buffer, 0, decodedData, 0, length );
-
- } // end try
- catch( java.io.IOException e )
- {
- System.err.println( "Error decoding from file " + filename );
- } // end catch: IOException
- finally
- {
- try{ bis.close(); } catch( Exception e) {}
- } // end finally
-
- return decodedData;
- } // end decodeFromFile
-
-
-
- /**
- * Convenience method for reading a binary file
- * and base64-encoding it.
- *
- * @param filename Filename for reading binary data
- * @return base64-encoded string or null if unsuccessful
- *
- * @since 2.1
- */
- public static String encodeFromFile( String filename )
- {
- String encodedData = null;
- MgBase64.InputStream bis = null;
- try
- {
- // Set up some useful variables
- java.io.File file = new java.io.File( filename );
- byte[] buffer = new byte[ (int)(file.length() * 1.4) ];
- int length = 0;
- int numBytes = 0;
-
- // Open a stream
- bis = new MgBase64.InputStream(
- new java.io.BufferedInputStream(
- new java.io.FileInputStream( file ) ), MgBase64.ENCODE );
-
- // Read until done
- while( ( numBytes = bis.read( buffer, length, 4096 ) ) >= 0 )
- length += numBytes;
-
- // Save in a variable to return
- encodedData = new String( buffer, 0, length, MgBase64.PREFERRED_ENCODING );
-
- } // end try
- catch( java.io.IOException e )
- {
- System.err.println( "Error encoding from file " + filename );
- } // end catch: IOException
- finally
- {
- try{ bis.close(); } catch( Exception e) {}
- } // end finally
-
- return encodedData;
- } // end encodeFromFile
-
-
-
-
- /* ******** I N N E R C L A S S I N P U T S T R E A M ******** */
-
-
-
- /**
- * A {@link MgBase64.InputStream} will read data from another
- * <tt>java.io.InputStream</tt>, given in the constructor,
- * and encode/decode to/from MgBase64 notation on the fly.
- *
- * @see MgBase64
- * @since 1.3
- */
- public static class InputStream extends java.io.FilterInputStream
- {
- private boolean encode; // Encoding or decoding
- private int position; // Current position in the buffer
- private byte[] buffer; // Small buffer holding converted data
- private int bufferLength; // Length of buffer (3 or 4)
- private int numSigBytes; // Number of meaningful bytes in the buffer
- private int lineLength;
- private boolean breakLines; // Break lines at less than 80 characters
-
-
- /**
- * Constructs a {@link MgBase64.InputStream} in DECODE mode.
- *
- * @param in the <tt>java.io.InputStream</tt> from which to read data.
- * @since 1.3
- */
- public InputStream( java.io.InputStream in )
- {
- this( in, DECODE );
- } // end constructor
-
-
- /**
- * Constructs a {@link MgBase64.InputStream} in
- * either ENCODE or DECODE mode.
- * <p>
- * Valid options:<pre>
- * ENCODE or DECODE: Encode or Decode as data is read.
- * DONT_BREAK_LINES: don't break lines at 76 characters
- * (only meaningful when encoding)
- * <i>Note: Technically, this makes your encoding non-compliant.</i>
- * </pre>
- * <p>
- * Example: <code>new MgBase64.InputStream( in, MgBase64.DECODE )</code>
- *
- *
- * @param in the <tt>java.io.InputStream</tt> from which to read data.
- * @param options Specified options
- * @see MgBase64#ENCODE
- * @see MgBase64#DECODE
- * @see MgBase64#DONT_BREAK_LINES
- * @since 2.0
- */
- public InputStream( java.io.InputStream in, int options )
- {
- super( in );
- this.breakLines = (options & DONT_BREAK_LINES) != DONT_BREAK_LINES;
- this.encode = (options & ENCODE) == ENCODE;
- this.bufferLength = encode ? 4 : 3;
- this.buffer = new byte[ bufferLength ];
- this.position = -1;
- this.lineLength = 0;
- } // end constructor
-
- /**
- * Reads enough of the input stream to convert
- * to/from Base64 and returns the next byte.
- *
- * @return next byte
- * @since 1.3
- */
- public int read() throws java.io.IOException
- {
- // Do we need to get data?
- if( position < 0 )
- {
- if( encode )
- {
- byte[] b3 = new byte[3];
- int numBinaryBytes = 0;
- for( int i = 0; i < 3; i++ )
- {
- try
- {
- int b = in.read();
-
- // If end of stream, b is -1.
- if( b >= 0 )
- {
- b3[i] = (byte)b;
- numBinaryBytes++;
- } // end if: not end of stream
-
- } // end try: read
- catch( java.io.IOException e )
- {
- // Only a problem if we got no data at all.
- if( i == 0 )
- throw e;
-
- } // end catch
- } // end for: each needed input byte
-
- if( numBinaryBytes > 0 )
- {
- encode3to4( b3, 0, numBinaryBytes, buffer, 0 );
- position = 0;
- numSigBytes = 4;
- } // end if: got data
- else
- {
- return -1;
- } // end else
- } // end if: encoding
-
- // Else decoding
- else
- {
- byte[] b4 = new byte[4];
- int i = 0;
- for( i = 0; i < 4; i++ )
- {
- // Read four "meaningful" bytes:
- int b = 0;
- do{ b = in.read(); }
- while( b >= 0 && DECODABET[ b & 0x7f ] <= WHITE_SPACE_ENC );
-
- if( b < 0 )
- break; // Reads a -1 if end of stream
-
- b4[i] = (byte)b;
- } // end for: each needed input byte
-
- if( i == 4 )
- {
- numSigBytes = decode4to3( b4, 0, buffer, 0 );
- position = 0;
- } // end if: got four characters
- else if( i == 0 ){
- return -1;
- } // end else if: also padded correctly
- else
- {
- // Must have broken out from above.
- throw new java.io.IOException( "Improperly padded Base64 input." );
- } // end
-
- } // end else: decode
- } // end else: get data
-
- // Got data?
- if( position >= 0 )
- {
- // End of relevant data?
- if( /*!encode &&*/ position >= numSigBytes )
- return -1;
-
- if( encode && breakLines && lineLength >= MAX_LINE_LENGTH )
- {
- lineLength = 0;
- return '\n';
- } // end if
- else
- {
- lineLength++; // This isn't important when decoding
- // but throwing an extra "if" seems
- // just as wasteful.
-
- int b = buffer[ position++ ];
-
- if( position >= bufferLength )
- position = -1;
-
- return b & 0xFF; // This is how you "cast" a byte that's
- // intended to be unsigned.
- } // end else
- } // end if: position >= 0
-
- // Else error
- else
- {
- // When JDK1.4 is more accepted, use an assertion here.
- throw new java.io.IOException( "Error in Base64 code reading stream." );
- } // end else
- } // end read
-
-
- /**
- * Calls {@link #read()} repeatedly until the end of stream
- * is reached or <var>len</var> bytes are read.
- * Returns number of bytes read into array or -1 if
- * end of stream is encountered.
- *
- * @param dest array to hold values
- * @param off offset for array
- * @param len max number of bytes to read into array
- * @return bytes read into array or -1 if end of stream is encountered.
- * @since 1.3
- */
- public int read( byte[] dest, int off, int len ) throws java.io.IOException
- {
- int i;
- int b;
- for( i = 0; i < len; i++ )
- {
- b = read();
-
- //if( b < 0 && i == 0 )
- // return -1;
-
- if( b >= 0 )
- dest[off + i] = (byte)b;
- else if( i == 0 )
- return -1;
- else
- break; // Out of 'for' loop
- } // end for: each byte read
- return i;
- } // end read
-
- } // end inner class InputStream
-
-
-
-
-
-
- /* ******** I N N E R C L A S S O U T P U T S T R E A M ******** */
-
-
-
- /**
- * A {@link MgBase64.OutputStream} will write data to another
- * <tt>java.io.OutputStream</tt>, given in the constructor,
- * and encode/decode to/from Base64 notation on the fly.
- *
- * @see Base64
- * @since 1.3
- */
- public static class OutputStream extends java.io.FilterOutputStream
- {
- private boolean encode;
- private int position;
- private byte[] buffer;
- private int bufferLength;
- private int lineLength;
- private boolean breakLines;
- private byte[] b4; // Scratch used in a few places
- private boolean suspendEncoding;
-
- /**
- * Constructs a {@link Base64.OutputStream} in ENCODE mode.
- *
- * @param out the <tt>java.io.OutputStream</tt> to which data will be written.
- * @since 1.3
- */
- public OutputStream( java.io.OutputStream out )
- {
- this( out, ENCODE );
- } // end constructor
-
-
- /**
- * Constructs a {@link Base64.OutputStream} in
- * either ENCODE or DECODE mode.
- * <p>
- * Valid options:<pre>
- * ENCODE or DECODE: Encode or Decode as data is read.
- * DONT_BREAK_LINES: don't break lines at 76 characters
- * (only meaningful when encoding)
- * <i>Note: Technically, this makes your encoding non-compliant.</i>
- * </pre>
- * <p>
- * Example: <code>new Base64.OutputStream( out, Base64.ENCODE )</code>
- *
- * @param out the <tt>java.io.OutputStream</tt> to which data will be written.
- * @param options Specified options.
- * @see Base64#ENCODE
- * @see Base64#DECODE
- * @see Base64#DONT_BREAK_LINES
- * @since 1.3
- */
- public OutputStream( java.io.OutputStream out, int options )
- {
- super( out );
- this.breakLines = (options & DONT_BREAK_LINES) != DONT_BREAK_LINES;
- this.encode = (options & ENCODE) == ENCODE;
- this.bufferLength = encode ? 3 : 4;
- this.buffer = new byte[ bufferLength ];
- this.position = 0;
- this.lineLength = 0;
- this.suspendEncoding = false;
- this.b4 = new byte[4];
- } // end constructor
-
-
- /**
- * Writes the byte to the output stream after
- * converting to/from Base64 notation.
- * When encoding, bytes are buffered three
- * at a time before the output stream actually
- * gets a write() call.
- * When decoding, bytes are buffered four
- * at a time.
- *
- * @param theByte the byte to write
- * @since 1.3
- */
- public void write(int theByte) throws java.io.IOException
- {
- // Encoding suspended?
- if( suspendEncoding )
- {
- super.out.write( theByte );
- return;
- } // end if: supsended
-
- // Encode?
- if( encode )
- {
- buffer[ position++ ] = (byte)theByte;
- if( position >= bufferLength ) // Enough to encode.
- {
- out.write( encode3to4( b4, buffer, bufferLength ) );
-
- lineLength += 4;
- if( breakLines && lineLength >= MAX_LINE_LENGTH )
- {
- out.write( NEW_LINE );
- lineLength = 0;
- } // end if: end of line
-
- position = 0;
- } // end if: enough to output
- } // end if: encoding
-
- // Else, Decoding
- else
- {
- // Meaningful Base64 character?
- if( DECODABET[ theByte & 0x7f ] > WHITE_SPACE_ENC )
- {
- buffer[ position++ ] = (byte)theByte;
- if( position >= bufferLength ) // Enough to output.
- {
- int len = MgBase64.decode4to3( buffer, 0, b4, 0 );
- out.write( b4, 0, len );
- //out.write( MgBase64.decode4to3( buffer ) );
- position = 0;
- } // end if: enough to output
- } // end if: meaningful base64 character
- else if( DECODABET[ theByte & 0x7f ] != WHITE_SPACE_ENC )
- {
- throw new java.io.IOException( "Invalid character in Base64 data." );
- } // end else: not white space either
- } // end else: decoding
- } // end write
-
-
-
- /**
- * Calls {@link #write(int)} repeatedly until <var>len</var>
- * bytes are written.
- *
- * @param theBytes array from which to read bytes
- * @param off offset for array
- * @param len max number of bytes to read into array
- * @since 1.3
- */
- public void write( byte[] theBytes, int off, int len ) throws java.io.IOException
- {
- // Encoding suspended?
- if( suspendEncoding )
- {
- super.out.write( theBytes, off, len );
- return;
- } // end if: supsended
-
- for( int i = 0; i < len; i++ )
- {
- write( theBytes[ off + i ] );
- } // end for: each byte written
-
- } // end write
-
-
-
- /**
- * Method added by PHIL. [Thanks, PHIL. -Rob]
- * This pads the buffer without closing the stream.
- */
- public void flushBase64() throws java.io.IOException
- {
- if( position > 0 )
- {
- if( encode )
- {
- out.write( encode3to4( b4, buffer, position ) );
- position = 0;
- } // end if: encoding
- else
- {
- throw new java.io.IOException( "Base64 input not properly padded." );
- } // end else: decoding
- } // end if: buffer partially full
-
- } // end flush
-
-
- /**
- * Flushes and closes (I think, in the superclass) the stream.
- *
- * @since 1.3
- */
- public void close() throws java.io.IOException
- {
- // 1. Ensure that pending characters are written
- flushBase64();
-
- // 2. Actually close the stream
- // Base class both flushes and closes.
- super.close();
-
- buffer = null;
- out = null;
- } // end close
-
-
-
- /**
- * Suspends encoding of the stream.
- * May be helpful if you need to embed a piece of
- * base640-encoded data in a stream.
- *
- * @since 1.5.1
- */
- public void suspendEncoding() throws java.io.IOException
- {
- flushBase64();
- this.suspendEncoding = true;
- } // end suspendEncoding
-
-
- /**
- * Resumes encoding of the stream.
- * May be helpful if you need to embed a piece of
- * base640-encoded data in a stream.
- *
- * @since 1.5.1
- */
- public void resumeEncoding()
- {
- this.suspendEncoding = false;
- } // end resumeEncoding
-
-
-
- } // end inner class OutputStream
-
-
-} // end class MgBase64
Copied: trunk/MgDev/Web/src/JavaApiEx/org/osgeo/mapguide/MgBase64.java (from rev 7251, sandbox/jng/swig-java/Web/src/JavaApiEx/org/osgeo/mapguide/MgBase64.java)
===================================================================
--- trunk/MgDev/Web/src/JavaApiEx/org/osgeo/mapguide/MgBase64.java (rev 0)
+++ trunk/MgDev/Web/src/JavaApiEx/org/osgeo/mapguide/MgBase64.java 2013-01-12 03:36:03 UTC (rev 7297)
@@ -0,0 +1,1469 @@
+//
+// Copyright (C) 2004-2011 by Autodesk, Inc.
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of version 2.1 of the GNU Lesser
+// General Public License as published by the Free Software Foundation.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+//
+
+/**
+ * Encodes and decodes to and from Base64 notation.
+ *
+ * <p>
+ * Change Log:
+ * </p>
+ * <ul>
+ * <li>v2.1 - Cleaned up javadoc comments and unused variables and methods. Added
+ * some convenience methods for reading and writing to and from files.</li>
+ * <li>v2.0.2 - Now specifies UTF-8 encoding in places where the code fails on systems
+ * with other encodings (like EBCDIC).</li>
+ * <li>v2.0.1 - Fixed an error when decoding a single byte, that is, when the
+ * encoded data was a single byte.</li>
+ * <li>v2.0 - I got rid of methods that used booleans to set options.
+ * Now everything is more consolidated and cleaner. The code now detects
+ * when data that's being decoded is gzip-compressed and will decompress it
+ * automatically. Generally things are cleaner. You'll probably have to
+ * change some method calls that you were making to support the new
+ * options format (<tt>int</tt>s that you "OR" together).</li>
+ * <li>v1.5.1 - Fixed bug when decompressing and decoding to a
+ * byte[] using <tt>decode( String s, boolean gzipCompressed )</tt>.
+ * Added the ability to "suspend" encoding in the Output Stream so
+ * you can turn on and off the encoding if you need to embed base64
+ * data in an otherwise "normal" stream (like an XML file).</li>
+ * <li>v1.5 - Output stream pases on flush() command but doesn't do anything itself.
+ * This helps when using GZIP streams.
+ * Added the ability to GZip-compress objects before encoding them.</li>
+ * <li>v1.4 - Added helper methods to read/write files.</li>
+ * <li>v1.3.6 - Fixed OutputStream.flush() so that 'position' is reset.</li>
+ * <li>v1.3.5 - Added flag to turn on and off line breaks. Fixed bug in input stream
+ * where last buffer being read, if not completely full, was not returned.</li>
+ * <li>v1.3.4 - Fixed when "improperly padded stream" error was thrown at the wrong time.</li>
+ * <li>v1.3.3 - Fixed I/O streams which were totally messed up.</li>
+ * </ul>
+ *
+ * <p>
+ * I am placing this code in the Public Domain. Do with it as you will.
+ * This software comes with no guarantees or warranties but with
+ * plenty of well-wishing instead!
+ * Please visit <a href="http://iharder.net/base64">http://iharder.net/base64</a>
+ * periodically to check for updates or to contribute improvements.
+ * </p>
+ *
+ * @author Robert Harder
+ * @author rob at iharder.net
+ * @version 2.1
+ */
+
+package org.osgeo.mapguide;
+
+public class MgBase64
+{
+
+/* ******** P U B L I C F I E L D S ******** */
+
+
+ /** No options specified. Value is zero. */
+ public final static int NO_OPTIONS = 0;
+
+ /** Specify encoding. */
+ public final static int ENCODE = 1;
+
+
+ /** Specify decoding. */
+ public final static int DECODE = 0;
+
+
+ /** Specify that data should be gzip-compressed. */
+ public final static int GZIP = 2;
+
+
+ /** Don't break lines when encoding (violates strict Base64 specification) */
+ public final static int DONT_BREAK_LINES = 8;
+
+
+/* ******** P R I V A T E F I E L D S ******** */
+
+
+ /** Maximum line length (76) of Base64 output. */
+ private final static int MAX_LINE_LENGTH = 76;
+
+
+ /** The equals sign (=) as a byte. */
+ private final static byte EQUALS_SIGN = (byte)'=';
+
+
+ /** The new line character (\n) as a byte. */
+ private final static byte NEW_LINE = (byte)'\n';
+
+
+ /** Preferred encoding. */
+ private final static String PREFERRED_ENCODING = "UTF-8";
+
+
+ /** The 64 valid Base64 values. */
+ private final static byte[] ALPHABET;
+ private final static byte[] _NATIVE_ALPHABET = /* May be something funny like EBCDIC */
+ {
+ (byte)'A', (byte)'B', (byte)'C', (byte)'D', (byte)'E', (byte)'F', (byte)'G',
+ (byte)'H', (byte)'I', (byte)'J', (byte)'K', (byte)'L', (byte)'M', (byte)'N',
+ (byte)'O', (byte)'P', (byte)'Q', (byte)'R', (byte)'S', (byte)'T', (byte)'U',
+ (byte)'V', (byte)'W', (byte)'X', (byte)'Y', (byte)'Z',
+ (byte)'a', (byte)'b', (byte)'c', (byte)'d', (byte)'e', (byte)'f', (byte)'g',
+ (byte)'h', (byte)'i', (byte)'j', (byte)'k', (byte)'l', (byte)'m', (byte)'n',
+ (byte)'o', (byte)'p', (byte)'q', (byte)'r', (byte)'s', (byte)'t', (byte)'u',
+ (byte)'v', (byte)'w', (byte)'x', (byte)'y', (byte)'z',
+ (byte)'0', (byte)'1', (byte)'2', (byte)'3', (byte)'4', (byte)'5',
+ (byte)'6', (byte)'7', (byte)'8', (byte)'9', (byte)'+', (byte)'/'
+ };
+
+ /** Determine which ALPHABET to use. */
+ static
+ {
+ byte[] __bytes;
+ try
+ {
+ __bytes = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".getBytes( PREFERRED_ENCODING );
+ } // end try
+ catch (java.io.UnsupportedEncodingException use)
+ {
+ __bytes = _NATIVE_ALPHABET; // Fall back to native encoding
+ } // end catch
+ ALPHABET = __bytes;
+ } // end static
+
+
+ /**
+ * Translates a Base64 value to either its 6-bit reconstruction value
+ * or a negative number indicating some other meaning.
+ **/
+ private final static byte[] DECODABET =
+ {
+ -9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 0 - 8
+ -5,-5, // Whitespace: Tab and Linefeed
+ -9,-9, // Decimal 11 - 12
+ -5, // Whitespace: Carriage Return
+ -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 14 - 26
+ -9,-9,-9,-9,-9, // Decimal 27 - 31
+ -5, // Whitespace: Space
+ -9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 33 - 42
+ 62, // Plus sign at decimal 43
+ -9,-9,-9, // Decimal 44 - 46
+ 63, // Slash at decimal 47
+ 52,53,54,55,56,57,58,59,60,61, // Numbers zero through nine
+ -9,-9,-9, // Decimal 58 - 60
+ -1, // Equals sign at decimal 61
+ -9,-9,-9, // Decimal 62 - 64
+ 0,1,2,3,4,5,6,7,8,9,10,11,12,13, // Letters 'A' through 'N'
+ 14,15,16,17,18,19,20,21,22,23,24,25, // Letters 'O' through 'Z'
+ -9,-9,-9,-9,-9,-9, // Decimal 91 - 96
+ 26,27,28,29,30,31,32,33,34,35,36,37,38, // Letters 'a' through 'm'
+ 39,40,41,42,43,44,45,46,47,48,49,50,51, // Letters 'n' through 'z'
+ -9,-9,-9,-9 // Decimal 123 - 126
+ /*,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 127 - 139
+ -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 140 - 152
+ -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 153 - 165
+ -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 166 - 178
+ -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 179 - 191
+ -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 192 - 204
+ -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 205 - 217
+ -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 218 - 230
+ -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9, // Decimal 231 - 243
+ -9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9,-9 // Decimal 244 - 255 */
+ };
+
+ // I think I end up not using the BAD_ENCODING indicator.
+ //private final static byte BAD_ENCODING = -9; // Indicates error in encoding
+ private final static byte WHITE_SPACE_ENC = -5; // Indicates white space in encoding
+ private final static byte EQUALS_SIGN_ENC = -1; // Indicates equals sign in encoding
+
+
+ /** Defeats instantiation. */
+ private MgBase64(){}
+
+
+
+/* ******** E N C O D I N G M E T H O D S ******** */
+
+
+ /**
+ * Encodes up to the first three bytes of array <var>threeBytes</var>
+ * and returns a four-byte array in Base64 notation.
+ * The actual number of significant bytes in your array is
+ * given by <var>numSigBytes</var>.
+ * The array <var>threeBytes</var> needs only be as big as
+ * <var>numSigBytes</var>.
+ * Code can reuse a byte array by passing a four-byte array as <var>b4</var>.
+ *
+ * @param b4 A reusable byte array to reduce array instantiation
+ * @param threeBytes the array to convert
+ * @param numSigBytes the number of significant bytes in your array
+ * @return four byte array in Base64 notation.
+ * @since 1.5.1
+ */
+ private static byte[] encode3to4( byte[] b4, byte[] threeBytes, int numSigBytes )
+ {
+ encode3to4( threeBytes, 0, numSigBytes, b4, 0 );
+ return b4;
+ } // end encode3to4
+
+
+ /**
+ * Encodes up to three bytes of the array <var>source</var>
+ * and writes the resulting four Base64 bytes to <var>destination</var>.
+ * The source and destination arrays can be manipulated
+ * anywhere along their length by specifying
+ * <var>srcOffset</var> and <var>destOffset</var>.
+ * This method does not check to make sure your arrays
+ * are large enough to accomodate <var>srcOffset</var> + 3 for
+ * the <var>source</var> array or <var>destOffset</var> + 4 for
+ * the <var>destination</var> array.
+ * The actual number of significant bytes in your array is
+ * given by <var>numSigBytes</var>.
+ *
+ * @param source the array to convert
+ * @param srcOffset the index where conversion begins
+ * @param numSigBytes the number of significant bytes in your array
+ * @param destination the array to hold the conversion
+ * @param destOffset the index where output will be put
+ * @return the <var>destination</var> array
+ * @since 1.3
+ */
+ private static byte[] encode3to4(
+ byte[] source, int srcOffset, int numSigBytes,
+ byte[] destination, int destOffset )
+ {
+ // 1 2 3
+ // 01234567890123456789012345678901 Bit position
+ // --------000000001111111122222222 Array position from threeBytes
+ // --------| || || || | Six bit groups to index ALPHABET
+ // >>18 >>12 >> 6 >> 0 Right shift necessary
+ // 0x3f 0x3f 0x3f Additional AND
+
+ // Create buffer with zero-padding if there are only one or two
+ // significant bytes passed in the array.
+ // We have to shift left 24 in order to flush out the 1's that appear
+ // when Java treats a value as negative that is cast from a byte to an int.
+ int inBuff = ( numSigBytes > 0 ? ((source[ srcOffset ] << 24) >>> 8) : 0 )
+ | ( numSigBytes > 1 ? ((source[ srcOffset + 1 ] << 24) >>> 16) : 0 )
+ | ( numSigBytes > 2 ? ((source[ srcOffset + 2 ] << 24) >>> 24) : 0 );
+
+ switch( numSigBytes )
+ {
+ case 3:
+ destination[ destOffset ] = ALPHABET[ (inBuff >>> 18) ];
+ destination[ destOffset + 1 ] = ALPHABET[ (inBuff >>> 12) & 0x3f ];
+ destination[ destOffset + 2 ] = ALPHABET[ (inBuff >>> 6) & 0x3f ];
+ destination[ destOffset + 3 ] = ALPHABET[ (inBuff ) & 0x3f ];
+ return destination;
+
+ case 2:
+ destination[ destOffset ] = ALPHABET[ (inBuff >>> 18) ];
+ destination[ destOffset + 1 ] = ALPHABET[ (inBuff >>> 12) & 0x3f ];
+ destination[ destOffset + 2 ] = ALPHABET[ (inBuff >>> 6) & 0x3f ];
+ destination[ destOffset + 3 ] = EQUALS_SIGN;
+ return destination;
+
+ case 1:
+ destination[ destOffset ] = ALPHABET[ (inBuff >>> 18) ];
+ destination[ destOffset + 1 ] = ALPHABET[ (inBuff >>> 12) & 0x3f ];
+ destination[ destOffset + 2 ] = EQUALS_SIGN;
+ destination[ destOffset + 3 ] = EQUALS_SIGN;
+ return destination;
+
+ default:
+ return destination;
+ } // end switch
+ } // end encode3to4
+
+
+
+ /**
+ * Serializes an object and returns the Base64-encoded
+ * version of that serialized object. If the object
+ * cannot be serialized or there is another error,
+ * the method will return <tt>null</tt>.
+ * The object is not GZip-compressed before being encoded.
+ *
+ * @param serializableObject The object to encode
+ * @return The Base64-encoded object
+ * @since 1.4
+ */
+ public static String encodeObject( java.io.Serializable serializableObject )
+ {
+ return encodeObject( serializableObject, NO_OPTIONS );
+ } // end encodeObject
+
+
+
+ /**
+ * Serializes an object and returns the Base64-encoded
+ * version of that serialized object. If the object
+ * cannot be serialized or there is another error,
+ * the method will return <tt>null</tt>.
+ * <p>
+ * Valid options:<pre>
+ * GZIP: gzip-compresses object before encoding it.
+ * DONT_BREAK_LINES: don't break lines at 76 characters
+ * <i>Note: Technically, this makes your encoding non-compliant.</i>
+ * </pre>
+ * <p>
+ * Example: <code>encodeObject( myObj, Base64.GZIP )</code> or
+ * <p>
+ * Example: <code>encodeObject( myObj, Base64.GZIP | Base64.DONT_BREAK_LINES )</code>
+ *
+ * @param serializableObject The object to encode
+ * @param options Specified options
+ * @return The Base64-encoded object
+ * @see Base64#GZIP
+ * @see Base64#DONT_BREAK_LINES
+ * @since 2.0
+ */
+ public static String encodeObject( java.io.Serializable serializableObject, int options )
+ {
+ // Streams
+ java.io.ByteArrayOutputStream baos = null;
+ java.io.OutputStream b64os = null;
+ java.io.ObjectOutputStream oos = null;
+ java.util.zip.GZIPOutputStream gzos = null;
+
+ // Isolate options
+ int gzip = (options & GZIP);
+ int dontBreakLines = (options & DONT_BREAK_LINES);
+
+ try
+ {
+ // ObjectOutputStream -> (GZIP) -> Base64 -> ByteArrayOutputStream
+ baos = new java.io.ByteArrayOutputStream();
+ b64os = new MgBase64.OutputStream( baos, ENCODE | dontBreakLines );
+
+ // GZip?
+ if( gzip == GZIP )
+ {
+ gzos = new java.util.zip.GZIPOutputStream( b64os );
+ oos = new java.io.ObjectOutputStream( gzos );
+ } // end if: gzip
+ else
+ oos = new java.io.ObjectOutputStream( b64os );
+
+ oos.writeObject( serializableObject );
+ } // end try
+ catch( java.io.IOException e )
+ {
+ e.printStackTrace();
+ return null;
+ } // end catch
+ finally
+ {
+ try{ oos.close(); } catch( Exception e ){}
+ try{ gzos.close(); } catch( Exception e ){}
+ try{ b64os.close(); } catch( Exception e ){}
+ try{ baos.close(); } catch( Exception e ){}
+ } // end finally
+
+ // Return value according to relevant encoding.
+ try
+ {
+ return new String( baos.toByteArray(), PREFERRED_ENCODING );
+ } // end try
+ catch (java.io.UnsupportedEncodingException uue)
+ {
+ return new String( baos.toByteArray() );
+ } // end catch
+
+ } // end encode
+
+
+
+ /**
+ * Encodes a byte array into Base64 notation.
+ * Does not GZip-compress data.
+ *
+ * @param source The data to convert
+ * @since 1.4
+ */
+ public static String encodeBytes( byte[] source )
+ {
+ return encodeBytes( source, 0, source.length, NO_OPTIONS );
+ } // end encodeBytes
+
+
+
+ /**
+ * Encodes a byte array into Base64 notation.
+ * <p>
+ * Valid options:<pre>
+ * GZIP: gzip-compresses object before encoding it.
+ * DONT_BREAK_LINES: don't break lines at 76 characters
+ * <i>Note: Technically, this makes your encoding non-compliant.</i>
+ * </pre>
+ * <p>
+ * Example: <code>encodeBytes( myData, Base64.GZIP )</code> or
+ * <p>
+ * Example: <code>encodeBytes( myData, Base64.GZIP | Base64.DONT_BREAK_LINES )</code>
+ *
+ *
+ * @param source The data to convert
+ * @param options Specified options
+ * @see Base64#GZIP
+ * @see Base64#DONT_BREAK_LINES
+ * @since 2.0
+ */
+ public static String encodeBytes( byte[] source, int options )
+ {
+ return encodeBytes( source, 0, source.length, options );
+ } // end encodeBytes
+
+
+ /**
+ * Encodes a byte array into Base64 notation.
+ * Does not GZip-compress data.
+ *
+ * @param source The data to convert
+ * @param off Offset in array where conversion should begin
+ * @param len Length of data to convert
+ * @since 1.4
+ */
+ public static String encodeBytes( byte[] source, int off, int len )
+ {
+ return encodeBytes( source, off, len, NO_OPTIONS );
+ } // end encodeBytes
+
+
+
+ /**
+ * Encodes a byte array into Base64 notation.
+ * <p>
+ * Valid options:<pre>
+ * GZIP: gzip-compresses object before encoding it.
+ * DONT_BREAK_LINES: don't break lines at 76 characters
+ * <i>Note: Technically, this makes your encoding non-compliant.</i>
+ * </pre>
+ * <p>
+ * Example: <code>encodeBytes( myData, Base64.GZIP )</code> or
+ * <p>
+ * Example: <code>encodeBytes( myData, Base64.GZIP | Base64.DONT_BREAK_LINES )</code>
+ *
+ *
+ * @param source The data to convert
+ * @param off Offset in array where conversion should begin
+ * @param len Length of data to convert
+ * @param options Specified options
+ * @see Base64#GZIP
+ * @see Base64#DONT_BREAK_LINES
+ * @since 2.0
+ */
+ public static String encodeBytes( byte[] source, int off, int len, int options )
+ {
+ // Isolate options
+ int dontBreakLines = ( options & DONT_BREAK_LINES );
+ int gzip = ( options & GZIP );
+
+ // Compress?
+ if( gzip == GZIP )
+ {
+ java.io.ByteArrayOutputStream baos = null;
+ java.util.zip.GZIPOutputStream gzos = null;
+ MgBase64.OutputStream b64os = null;
+
+
+ try
+ {
+ // GZip -> Base64 -> ByteArray
+ baos = new java.io.ByteArrayOutputStream();
+ b64os = new MgBase64.OutputStream( baos, ENCODE | dontBreakLines );
+ gzos = new java.util.zip.GZIPOutputStream( b64os );
+
+ gzos.write( source, off, len );
+ gzos.close();
+ } // end try
+ catch( java.io.IOException e )
+ {
+ e.printStackTrace();
+ return null;
+ } // end catch
+ finally
+ {
+ try{ gzos.close(); } catch( Exception e ){}
+ try{ b64os.close(); } catch( Exception e ){}
+ try{ baos.close(); } catch( Exception e ){}
+ } // end finally
+
+ // Return value according to relevant encoding.
+ try
+ {
+ return new String( baos.toByteArray(), PREFERRED_ENCODING );
+ } // end try
+ catch (java.io.UnsupportedEncodingException uue)
+ {
+ return new String( baos.toByteArray() );
+ } // end catch
+ } // end if: compress
+
+ // Else, don't compress. Better not to use streams at all then.
+ else
+ {
+ // Convert option to boolean in way that code likes it.
+ boolean breakLines = dontBreakLines == 0;
+
+ int len43 = len * 4 / 3;
+ byte[] outBuff = new byte[ ( len43 ) // Main 4:3
+ + ( (len % 3) > 0 ? 4 : 0 ) // Account for padding
+ + (breakLines ? ( len43 / MAX_LINE_LENGTH ) : 0) ]; // New lines
+ int d = 0;
+ int e = 0;
+ int len2 = len - 2;
+ int lineLength = 0;
+ for( ; d < len2; d+=3, e+=4 )
+ {
+ encode3to4( source, d+off, 3, outBuff, e );
+
+ lineLength += 4;
+ if( breakLines && lineLength == MAX_LINE_LENGTH )
+ {
+ outBuff[e+4] = NEW_LINE;
+ e++;
+ lineLength = 0;
+ } // end if: end of line
+ } // en dfor: each piece of array
+
+ if( d < len )
+ {
+ encode3to4( source, d+off, len - d, outBuff, e );
+ e += 4;
+ } // end if: some padding needed
+
+
+ // Return value according to relevant encoding.
+ try
+ {
+ return new String( outBuff, 0, e, PREFERRED_ENCODING );
+ } // end try
+ catch (java.io.UnsupportedEncodingException uue)
+ {
+ return new String( outBuff, 0, e );
+ } // end catch
+
+ } // end else: don't compress
+
+ } // end encodeBytes
+
+
+
+
+
+/* ******** D E C O D I N G M E T H O D S ******** */
+
+
+ /**
+ * Decodes four bytes from array <var>source</var>
+ * and writes the resulting bytes (up to three of them)
+ * to <var>destination</var>.
+ * The source and destination arrays can be manipulated
+ * anywhere along their length by specifying
+ * <var>srcOffset</var> and <var>destOffset</var>.
+ * This method does not check to make sure your arrays
+ * are large enough to accomodate <var>srcOffset</var> + 4 for
+ * the <var>source</var> array or <var>destOffset</var> + 3 for
+ * the <var>destination</var> array.
+ * This method returns the actual number of bytes that
+ * were converted from the Base64 encoding.
+ *
+ *
+ * @param source the array to convert
+ * @param srcOffset the index where conversion begins
+ * @param destination the array to hold the conversion
+ * @param destOffset the index where output will be put
+ * @return the number of decoded bytes converted
+ * @since 1.3
+ */
+ private static int decode4to3( byte[] source, int srcOffset, byte[] destination, int destOffset )
+ {
+ // Example: Dk==
+ if( source[ srcOffset + 2] == EQUALS_SIGN )
+ {
+ // Two ways to do the same thing. Don't know which way I like best.
+ //int outBuff = ( ( DECODABET[ source[ srcOffset ] ] << 24 ) >>> 6 )
+ // | ( ( DECODABET[ source[ srcOffset + 1] ] << 24 ) >>> 12 );
+ int outBuff = ( ( DECODABET[ source[ srcOffset ] ] & 0xFF ) << 18 )
+ | ( ( DECODABET[ source[ srcOffset + 1] ] & 0xFF ) << 12 );
+
+ destination[ destOffset ] = (byte)( outBuff >>> 16 );
+ return 1;
+ }
+
+ // Example: DkL=
+ else if( source[ srcOffset + 3 ] == EQUALS_SIGN )
+ {
+ // Two ways to do the same thing. Don't know which way I like best.
+ //int outBuff = ( ( DECODABET[ source[ srcOffset ] ] << 24 ) >>> 6 )
+ // | ( ( DECODABET[ source[ srcOffset + 1 ] ] << 24 ) >>> 12 )
+ // | ( ( DECODABET[ source[ srcOffset + 2 ] ] << 24 ) >>> 18 );
+ int outBuff = ( ( DECODABET[ source[ srcOffset ] ] & 0xFF ) << 18 )
+ | ( ( DECODABET[ source[ srcOffset + 1 ] ] & 0xFF ) << 12 )
+ | ( ( DECODABET[ source[ srcOffset + 2 ] ] & 0xFF ) << 6 );
+
+ destination[ destOffset ] = (byte)( outBuff >>> 16 );
+ destination[ destOffset + 1 ] = (byte)( outBuff >>> 8 );
+ return 2;
+ }
+
+ // Example: DkLE
+ else
+ {
+ try{
+ // Two ways to do the same thing. Don't know which way I like best.
+ //int outBuff = ( ( DECODABET[ source[ srcOffset ] ] << 24 ) >>> 6 )
+ // | ( ( DECODABET[ source[ srcOffset + 1 ] ] << 24 ) >>> 12 )
+ // | ( ( DECODABET[ source[ srcOffset + 2 ] ] << 24 ) >>> 18 )
+ // | ( ( DECODABET[ source[ srcOffset + 3 ] ] << 24 ) >>> 24 );
+ int outBuff = ( ( DECODABET[ source[ srcOffset ] ] & 0xFF ) << 18 )
+ | ( ( DECODABET[ source[ srcOffset + 1 ] ] & 0xFF ) << 12 )
+ | ( ( DECODABET[ source[ srcOffset + 2 ] ] & 0xFF ) << 6)
+ | ( ( DECODABET[ source[ srcOffset + 3 ] ] & 0xFF ) );
+
+
+ destination[ destOffset ] = (byte)( outBuff >> 16 );
+ destination[ destOffset + 1 ] = (byte)( outBuff >> 8 );
+ destination[ destOffset + 2 ] = (byte)( outBuff );
+
+ return 3;
+ }catch( Exception e){
+ System.out.println(""+source[srcOffset]+ ": " + ( DECODABET[ source[ srcOffset ] ] ) );
+ System.out.println(""+source[srcOffset+1]+ ": " + ( DECODABET[ source[ srcOffset + 1 ] ] ) );
+ System.out.println(""+source[srcOffset+2]+ ": " + ( DECODABET[ source[ srcOffset + 2 ] ] ) );
+ System.out.println(""+source[srcOffset+3]+ ": " + ( DECODABET[ source[ srcOffset + 3 ] ] ) );
+ return -1;
+ } //e nd catch
+ }
+ } // end decodeToBytes
+
+
+
+
+ /**
+ * Very low-level access to decoding ASCII characters in
+ * the form of a byte array. Does not support automatically
+ * gunzipping or any other "fancy" features.
+ *
+ * @param source The Base64 encoded data
+ * @param off The offset of where to begin decoding
+ * @param len The length of characters to decode
+ * @return decoded data
+ * @since 1.3
+ */
+ public static byte[] decode( byte[] source, int off, int len )
+ {
+ int len34 = len * 3 / 4;
+ byte[] outBuff = new byte[ len34 ]; // Upper limit on size of output
+ int outBuffPosn = 0;
+
+ byte[] b4 = new byte[4];
+ int b4Posn = 0;
+ int i = 0;
+ byte sbiCrop = 0;
+ byte sbiDecode = 0;
+ for( i = off; i < off+len; i++ )
+ {
+ sbiCrop = (byte)(source[i] & 0x7f); // Only the low seven bits
+ sbiDecode = DECODABET[ sbiCrop ];
+
+ if( sbiDecode >= WHITE_SPACE_ENC ) // White space, Equals sign or better
+ {
+ if( sbiDecode >= EQUALS_SIGN_ENC )
+ {
+ b4[ b4Posn++ ] = sbiCrop;
+ if( b4Posn > 3 )
+ {
+ outBuffPosn += decode4to3( b4, 0, outBuff, outBuffPosn );
+ b4Posn = 0;
+
+ // If that was the equals sign, break out of 'for' loop
+ if( sbiCrop == EQUALS_SIGN )
+ break;
+ } // end if: quartet built
+
+ } // end if: equals sign or better
+
+ } // end if: white space, equals sign or better
+ else
+ {
+ System.err.println( "Bad Base64 input character at " + i + ": " + source[i] + "(decimal)" );
+ return null;
+ } // end else:
+ } // each input character
+
+ byte[] out = new byte[ outBuffPosn ];
+ System.arraycopy( outBuff, 0, out, 0, outBuffPosn );
+ return out;
+ } // end decode
+
+
+
+
+ /**
+ * Decodes data from Base64 notation, automatically
+ * detecting gzip-compressed data and decompressing it.
+ *
+ * @param s the string to decode
+ * @return the decoded data
+ * @since 1.4
+ */
+ public static byte[] decode( String s )
+ {
+ byte[] bytes;
+ try
+ {
+ bytes = s.getBytes( PREFERRED_ENCODING );
+ } // end try
+ catch( java.io.UnsupportedEncodingException uee )
+ {
+ bytes = s.getBytes();
+ } // end catch
+ //</change>
+
+ // Decode
+ bytes = decode( bytes, 0, bytes.length );
+
+
+ // Check to see if it's gzip-compressed
+ // GZIP Magic Two-Byte Number: 0x8b1f (35615)
+ if( bytes != null && bytes.length >= 4 )
+ {
+
+ int head = ((int)bytes[0] & 0xff) | ((bytes[1] << 8) & 0xff00);
+ if( java.util.zip.GZIPInputStream.GZIP_MAGIC == head )
+ {
+ java.io.ByteArrayInputStream bais = null;
+ java.util.zip.GZIPInputStream gzis = null;
+ java.io.ByteArrayOutputStream baos = null;
+ byte[] buffer = new byte[2048];
+ int length = 0;
+
+ try
+ {
+ baos = new java.io.ByteArrayOutputStream();
+ bais = new java.io.ByteArrayInputStream( bytes );
+ gzis = new java.util.zip.GZIPInputStream( bais );
+
+ while( ( length = gzis.read( buffer ) ) >= 0 )
+ {
+ baos.write(buffer,0,length);
+ } // end while: reading input
+
+ // No error? Get new bytes.
+ bytes = baos.toByteArray();
+
+ } // end try
+ catch( java.io.IOException e )
+ {
+ // Just return originally-decoded bytes
+ } // end catch
+ finally
+ {
+ try{ baos.close(); } catch( Exception e ){}
+ try{ gzis.close(); } catch( Exception e ){}
+ try{ bais.close(); } catch( Exception e ){}
+ } // end finally
+
+ } // end if: gzipped
+ } // end if: bytes.length >= 2
+
+ return bytes;
+ } // end decode
+
+
+
+
+ /**
+ * Attempts to decode Base64 data and deserialize a Java
+ * Object within. Returns <tt>null</tt> if there was an error.
+ *
+ * @param encodedObject The Base64 data to decode
+ * @return The decoded and deserialized object
+ * @since 1.5
+ */
+ public static Object decodeToObject( String encodedObject )
+ {
+ // Decode and gunzip if necessary
+ byte[] objBytes = decode( encodedObject );
+
+ java.io.ByteArrayInputStream bais = null;
+ java.io.ObjectInputStream ois = null;
+ Object obj = null;
+
+ try
+ {
+ bais = new java.io.ByteArrayInputStream( objBytes );
+ ois = new java.io.ObjectInputStream( bais );
+
+ obj = ois.readObject();
+ } // end try
+ catch( java.io.IOException e )
+ {
+ e.printStackTrace();
+ obj = null;
+ } // end catch
+ catch( java.lang.ClassNotFoundException e )
+ {
+ e.printStackTrace();
+ obj = null;
+ } // end catch
+ finally
+ {
+ try{ bais.close(); } catch( Exception e ){}
+ try{ ois.close(); } catch( Exception e ){}
+ } // end finally
+
+ return obj;
+ } // end decodeObject
+
+
+
+ /**
+ * Convenience method for encoding data to a file.
+ *
+ * @param dataToEncode byte array of data to encode in base64 form
+ * @param filename Filename for saving encoded data
+ * @return <tt>true</tt> if successful, <tt>false</tt> otherwise
+ *
+ * @since 2.1
+ */
+ public static boolean encodeToFile( byte[] dataToEncode, String filename )
+ {
+ boolean success = false;
+ MgBase64.OutputStream bos = null;
+ try
+ {
+ bos = new MgBase64.OutputStream(
+ new java.io.FileOutputStream( filename ), MgBase64.ENCODE );
+ bos.write( dataToEncode );
+ success = true;
+ } // end try
+ catch( java.io.IOException e )
+ {
+
+ success = false;
+ } // end catch: IOException
+ finally
+ {
+ try{ bos.close(); } catch( Exception e ){}
+ } // end finally
+
+ return success;
+ } // end encodeToFile
+
+
+ /**
+ * Convenience method for decoding data to a file.
+ *
+ * @param dataToDecode Base64-encoded data as a string
+ * @param filename Filename for saving decoded data
+ * @return <tt>true</tt> if successful, <tt>false</tt> otherwise
+ *
+ * @since 2.1
+ */
+ public static boolean decodeToFile( String dataToDecode, String filename )
+ {
+ boolean success = false;
+ MgBase64.OutputStream bos = null;
+ try
+ {
+ bos = new MgBase64.OutputStream(
+ new java.io.FileOutputStream( filename ), MgBase64.DECODE );
+ bos.write( dataToDecode.getBytes( PREFERRED_ENCODING ) );
+ success = true;
+ } // end try
+ catch( java.io.IOException e )
+ {
+ success = false;
+ } // end catch: IOException
+ finally
+ {
+ try{ bos.close(); } catch( Exception e ){}
+ } // end finally
+
+ return success;
+ } // end decodeToFile
+
+
+
+
+ /**
+ * Convenience method for reading a base64-encoded
+ * file and decoding it.
+ *
+ * @param filename Filename for reading encoded data
+ * @return decoded byte array or null if unsuccessful
+ *
+ * @since 2.1
+ */
+ public static byte[] decodeFromFile( String filename )
+ {
+ byte[] decodedData = null;
+ MgBase64.InputStream bis = null;
+ try
+ {
+ // Set up some useful variables
+ java.io.File file = new java.io.File( filename );
+ byte[] buffer = null;
+ int length = 0;
+ int numBytes = 0;
+
+ // Check for size of file
+ if( file.length() > Integer.MAX_VALUE )
+ {
+ System.err.println( "File is too big for this convenience method (" + file.length() + " bytes)." );
+ return null;
+ } // end if: file too big for int index
+ buffer = new byte[ (int)file.length() ];
+
+ // Open a stream
+ bis = new MgBase64.InputStream(
+ new java.io.BufferedInputStream(
+ new java.io.FileInputStream( file ) ), MgBase64.DECODE );
+
+ // Read until done
+ while( ( numBytes = bis.read( buffer, length, 4096 ) ) >= 0 )
+ length += numBytes;
+
+ // Save in a variable to return
+ decodedData = new byte[ length ];
+ System.arraycopy( buffer, 0, decodedData, 0, length );
+
+ } // end try
+ catch( java.io.IOException e )
+ {
+ System.err.println( "Error decoding from file " + filename );
+ } // end catch: IOException
+ finally
+ {
+ try{ bis.close(); } catch( Exception e) {}
+ } // end finally
+
+ return decodedData;
+ } // end decodeFromFile
+
+
+
+ /**
+ * Convenience method for reading a binary file
+ * and base64-encoding it.
+ *
+ * @param filename Filename for reading binary data
+ * @return base64-encoded string or null if unsuccessful
+ *
+ * @since 2.1
+ */
+ public static String encodeFromFile( String filename )
+ {
+ String encodedData = null;
+ MgBase64.InputStream bis = null;
+ try
+ {
+ // Set up some useful variables
+ java.io.File file = new java.io.File( filename );
+ byte[] buffer = new byte[ (int)(file.length() * 1.4) ];
+ int length = 0;
+ int numBytes = 0;
+
+ // Open a stream
+ bis = new MgBase64.InputStream(
+ new java.io.BufferedInputStream(
+ new java.io.FileInputStream( file ) ), MgBase64.ENCODE );
+
+ // Read until done
+ while( ( numBytes = bis.read( buffer, length, 4096 ) ) >= 0 )
+ length += numBytes;
+
+ // Save in a variable to return
+ encodedData = new String( buffer, 0, length, MgBase64.PREFERRED_ENCODING );
+
+ } // end try
+ catch( java.io.IOException e )
+ {
+ System.err.println( "Error encoding from file " + filename );
+ } // end catch: IOException
+ finally
+ {
+ try{ bis.close(); } catch( Exception e) {}
+ } // end finally
+
+ return encodedData;
+ } // end encodeFromFile
+
+
+
+
+ /* ******** I N N E R C L A S S I N P U T S T R E A M ******** */
+
+
+
+ /**
+ * A {@link MgBase64.InputStream} will read data from another
+ * <tt>java.io.InputStream</tt>, given in the constructor,
+ * and encode/decode to/from MgBase64 notation on the fly.
+ *
+ * @see MgBase64
+ * @since 1.3
+ */
+ public static class InputStream extends java.io.FilterInputStream
+ {
+ private boolean encode; // Encoding or decoding
+ private int position; // Current position in the buffer
+ private byte[] buffer; // Small buffer holding converted data
+ private int bufferLength; // Length of buffer (3 or 4)
+ private int numSigBytes; // Number of meaningful bytes in the buffer
+ private int lineLength;
+ private boolean breakLines; // Break lines at less than 80 characters
+
+
+ /**
+ * Constructs a {@link MgBase64.InputStream} in DECODE mode.
+ *
+ * @param in the <tt>java.io.InputStream</tt> from which to read data.
+ * @since 1.3
+ */
+ public InputStream( java.io.InputStream in )
+ {
+ this( in, DECODE );
+ } // end constructor
+
+
+ /**
+ * Constructs a {@link MgBase64.InputStream} in
+ * either ENCODE or DECODE mode.
+ * <p>
+ * Valid options:<pre>
+ * ENCODE or DECODE: Encode or Decode as data is read.
+ * DONT_BREAK_LINES: don't break lines at 76 characters
+ * (only meaningful when encoding)
+ * <i>Note: Technically, this makes your encoding non-compliant.</i>
+ * </pre>
+ * <p>
+ * Example: <code>new MgBase64.InputStream( in, MgBase64.DECODE )</code>
+ *
+ *
+ * @param in the <tt>java.io.InputStream</tt> from which to read data.
+ * @param options Specified options
+ * @see MgBase64#ENCODE
+ * @see MgBase64#DECODE
+ * @see MgBase64#DONT_BREAK_LINES
+ * @since 2.0
+ */
+ public InputStream( java.io.InputStream in, int options )
+ {
+ super( in );
+ this.breakLines = (options & DONT_BREAK_LINES) != DONT_BREAK_LINES;
+ this.encode = (options & ENCODE) == ENCODE;
+ this.bufferLength = encode ? 4 : 3;
+ this.buffer = new byte[ bufferLength ];
+ this.position = -1;
+ this.lineLength = 0;
+ } // end constructor
+
+ /**
+ * Reads enough of the input stream to convert
+ * to/from Base64 and returns the next byte.
+ *
+ * @return next byte
+ * @since 1.3
+ */
+ public int read() throws java.io.IOException
+ {
+ // Do we need to get data?
+ if( position < 0 )
+ {
+ if( encode )
+ {
+ byte[] b3 = new byte[3];
+ int numBinaryBytes = 0;
+ for( int i = 0; i < 3; i++ )
+ {
+ try
+ {
+ int b = in.read();
+
+ // If end of stream, b is -1.
+ if( b >= 0 )
+ {
+ b3[i] = (byte)b;
+ numBinaryBytes++;
+ } // end if: not end of stream
+
+ } // end try: read
+ catch( java.io.IOException e )
+ {
+ // Only a problem if we got no data at all.
+ if( i == 0 )
+ throw e;
+
+ } // end catch
+ } // end for: each needed input byte
+
+ if( numBinaryBytes > 0 )
+ {
+ encode3to4( b3, 0, numBinaryBytes, buffer, 0 );
+ position = 0;
+ numSigBytes = 4;
+ } // end if: got data
+ else
+ {
+ return -1;
+ } // end else
+ } // end if: encoding
+
+ // Else decoding
+ else
+ {
+ byte[] b4 = new byte[4];
+ int i = 0;
+ for( i = 0; i < 4; i++ )
+ {
+ // Read four "meaningful" bytes:
+ int b = 0;
+ do{ b = in.read(); }
+ while( b >= 0 && DECODABET[ b & 0x7f ] <= WHITE_SPACE_ENC );
+
+ if( b < 0 )
+ break; // Reads a -1 if end of stream
+
+ b4[i] = (byte)b;
+ } // end for: each needed input byte
+
+ if( i == 4 )
+ {
+ numSigBytes = decode4to3( b4, 0, buffer, 0 );
+ position = 0;
+ } // end if: got four characters
+ else if( i == 0 ){
+ return -1;
+ } // end else if: also padded correctly
+ else
+ {
+ // Must have broken out from above.
+ throw new java.io.IOException( "Improperly padded Base64 input." );
+ } // end
+
+ } // end else: decode
+ } // end else: get data
+
+ // Got data?
+ if( position >= 0 )
+ {
+ // End of relevant data?
+ if( /*!encode &&*/ position >= numSigBytes )
+ return -1;
+
+ if( encode && breakLines && lineLength >= MAX_LINE_LENGTH )
+ {
+ lineLength = 0;
+ return '\n';
+ } // end if
+ else
+ {
+ lineLength++; // This isn't important when decoding
+ // but throwing an extra "if" seems
+ // just as wasteful.
+
+ int b = buffer[ position++ ];
+
+ if( position >= bufferLength )
+ position = -1;
+
+ return b & 0xFF; // This is how you "cast" a byte that's
+ // intended to be unsigned.
+ } // end else
+ } // end if: position >= 0
+
+ // Else error
+ else
+ {
+ // When JDK1.4 is more accepted, use an assertion here.
+ throw new java.io.IOException( "Error in Base64 code reading stream." );
+ } // end else
+ } // end read
+
+
+ /**
+ * Calls {@link #read()} repeatedly until the end of stream
+ * is reached or <var>len</var> bytes are read.
+ * Returns number of bytes read into array or -1 if
+ * end of stream is encountered.
+ *
+ * @param dest array to hold values
+ * @param off offset for array
+ * @param len max number of bytes to read into array
+ * @return bytes read into array or -1 if end of stream is encountered.
+ * @since 1.3
+ */
+ public int read( byte[] dest, int off, int len ) throws java.io.IOException
+ {
+ int i;
+ int b;
+ for( i = 0; i < len; i++ )
+ {
+ b = read();
+
+ //if( b < 0 && i == 0 )
+ // return -1;
+
+ if( b >= 0 )
+ dest[off + i] = (byte)b;
+ else if( i == 0 )
+ return -1;
+ else
+ break; // Out of 'for' loop
+ } // end for: each byte read
+ return i;
+ } // end read
+
+ } // end inner class InputStream
+
+
+
+
+
+
+ /* ******** I N N E R C L A S S O U T P U T S T R E A M ******** */
+
+
+
+ /**
+ * A {@link MgBase64.OutputStream} will write data to another
+ * <tt>java.io.OutputStream</tt>, given in the constructor,
+ * and encode/decode to/from Base64 notation on the fly.
+ *
+ * @see Base64
+ * @since 1.3
+ */
+ public static class OutputStream extends java.io.FilterOutputStream
+ {
+ private boolean encode;
+ private int position;
+ private byte[] buffer;
+ private int bufferLength;
+ private int lineLength;
+ private boolean breakLines;
+ private byte[] b4; // Scratch used in a few places
+ private boolean suspendEncoding;
+
+ /**
+ * Constructs a {@link Base64.OutputStream} in ENCODE mode.
+ *
+ * @param out the <tt>java.io.OutputStream</tt> to which data will be written.
+ * @since 1.3
+ */
+ public OutputStream( java.io.OutputStream out )
+ {
+ this( out, ENCODE );
+ } // end constructor
+
+
+ /**
+ * Constructs a {@link Base64.OutputStream} in
+ * either ENCODE or DECODE mode.
+ * <p>
+ * Valid options:<pre>
+ * ENCODE or DECODE: Encode or Decode as data is read.
+ * DONT_BREAK_LINES: don't break lines at 76 characters
+ * (only meaningful when encoding)
+ * <i>Note: Technically, this makes your encoding non-compliant.</i>
+ * </pre>
+ * <p>
+ * Example: <code>new Base64.OutputStream( out, Base64.ENCODE )</code>
+ *
+ * @param out the <tt>java.io.OutputStream</tt> to which data will be written.
+ * @param options Specified options.
+ * @see Base64#ENCODE
+ * @see Base64#DECODE
+ * @see Base64#DONT_BREAK_LINES
+ * @since 1.3
+ */
+ public OutputStream( java.io.OutputStream out, int options )
+ {
+ super( out );
+ this.breakLines = (options & DONT_BREAK_LINES) != DONT_BREAK_LINES;
+ this.encode = (options & ENCODE) == ENCODE;
+ this.bufferLength = encode ? 3 : 4;
+ this.buffer = new byte[ bufferLength ];
+ this.position = 0;
+ this.lineLength = 0;
+ this.suspendEncoding = false;
+ this.b4 = new byte[4];
+ } // end constructor
+
+
+ /**
+ * Writes the byte to the output stream after
+ * converting to/from Base64 notation.
+ * When encoding, bytes are buffered three
+ * at a time before the output stream actually
+ * gets a write() call.
+ * When decoding, bytes are buffered four
+ * at a time.
+ *
+ * @param theByte the byte to write
+ * @since 1.3
+ */
+ public void write(int theByte) throws java.io.IOException
+ {
+ // Encoding suspended?
+ if( suspendEncoding )
+ {
+ super.out.write( theByte );
+ return;
+ } // end if: supsended
+
+ // Encode?
+ if( encode )
+ {
+ buffer[ position++ ] = (byte)theByte;
+ if( position >= bufferLength ) // Enough to encode.
+ {
+ out.write( encode3to4( b4, buffer, bufferLength ) );
+
+ lineLength += 4;
+ if( breakLines && lineLength >= MAX_LINE_LENGTH )
+ {
+ out.write( NEW_LINE );
+ lineLength = 0;
+ } // end if: end of line
+
+ position = 0;
+ } // end if: enough to output
+ } // end if: encoding
+
+ // Else, Decoding
+ else
+ {
+ // Meaningful Base64 character?
+ if( DECODABET[ theByte & 0x7f ] > WHITE_SPACE_ENC )
+ {
+ buffer[ position++ ] = (byte)theByte;
+ if( position >= bufferLength ) // Enough to output.
+ {
+ int len = MgBase64.decode4to3( buffer, 0, b4, 0 );
+ out.write( b4, 0, len );
+ //out.write( MgBase64.decode4to3( buffer ) );
+ position = 0;
+ } // end if: enough to output
+ } // end if: meaningful base64 character
+ else if( DECODABET[ theByte & 0x7f ] != WHITE_SPACE_ENC )
+ {
+ throw new java.io.IOException( "Invalid character in Base64 data." );
+ } // end else: not white space either
+ } // end else: decoding
+ } // end write
+
+
+
+ /**
+ * Calls {@link #write(int)} repeatedly until <var>len</var>
+ * bytes are written.
+ *
+ * @param theBytes array from which to read bytes
+ * @param off offset for array
+ * @param len max number of bytes to read into array
+ * @since 1.3
+ */
+ public void write( byte[] theBytes, int off, int len ) throws java.io.IOException
+ {
+ // Encoding suspended?
+ if( suspendEncoding )
+ {
+ super.out.write( theBytes, off, len );
+ return;
+ } // end if: supsended
+
+ for( int i = 0; i < len; i++ )
+ {
+ write( theBytes[ off + i ] );
+ } // end for: each byte written
+
+ } // end write
+
+
+
+ /**
+ * Method added by PHIL. [Thanks, PHIL. -Rob]
+ * This pads the buffer without closing the stream.
+ */
+ public void flushBase64() throws java.io.IOException
+ {
+ if( position > 0 )
+ {
+ if( encode )
+ {
+ out.write( encode3to4( b4, buffer, position ) );
+ position = 0;
+ } // end if: encoding
+ else
+ {
+ throw new java.io.IOException( "Base64 input not properly padded." );
+ } // end else: decoding
+ } // end if: buffer partially full
+
+ } // end flush
+
+
+ /**
+ * Flushes and closes (I think, in the superclass) the stream.
+ *
+ * @since 1.3
+ */
+ public void close() throws java.io.IOException
+ {
+ // 1. Ensure that pending characters are written
+ flushBase64();
+
+ // 2. Actually close the stream
+ // Base class both flushes and closes.
+ super.close();
+
+ buffer = null;
+ out = null;
+ } // end close
+
+
+
+ /**
+ * Suspends encoding of the stream.
+ * May be helpful if you need to embed a piece of
+ * base640-encoded data in a stream.
+ *
+ * @since 1.5.1
+ */
+ public void suspendEncoding() throws java.io.IOException
+ {
+ flushBase64();
+ this.suspendEncoding = true;
+ } // end suspendEncoding
+
+
+ /**
+ * Resumes encoding of the stream.
+ * May be helpful if you need to embed a piece of
+ * base640-encoded data in a stream.
+ *
+ * @since 1.5.1
+ */
+ public void resumeEncoding()
+ {
+ this.suspendEncoding = false;
+ } // end resumeEncoding
+
+
+
+ } // end inner class OutputStream
+
+
+} // end class MgBase64
Deleted: trunk/MgDev/Web/src/JavaApiEx/org/osgeo/mapguide/MgLocalizer.java
===================================================================
--- sandbox/jng/swig-java/Web/src/JavaApiEx/org/osgeo/mapguide/MgLocalizer.java 2012-12-08 14:59:43 UTC (rev 7251)
+++ trunk/MgDev/Web/src/JavaApiEx/org/osgeo/mapguide/MgLocalizer.java 2013-01-12 03:36:03 UTC (rev 7297)
@@ -1,154 +0,0 @@
-/*
- Copyright (C) 2004-2011 by Autodesk, Inc.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of version 2.1 of the GNU Lesser
- General Public License as published by the Free Software Foundation.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-
-package org.osgeo.mapguide;
-
-import java.util.*;
-import java.io.*;
-
-public class MgLocalizer
-{
- protected static String english = "en";
- protected static String localizationPath = "";
- protected static Hashtable languages = new Hashtable();
-
- public static void SetLocalizedFilesPath(String path)
- {
- localizationPath = path;
- }
-
- public static String Localize(String text, String locale, int os)
- {
- String fontSuffix = (os==0? "Windows": (os==1? "Macintosh": "Linux"));
- Hashtable sb = null;
- try
- {
- sb = GetStringBundle(locale);
- }
- catch (Exception e)
- {
- return "";
- }
- int len = text.length();
-
- for (int i = 0; i < len; )
- {
- int pos1 = text.indexOf("__#", i);
- if (pos1 != -1)
- {
- int pos2 = text.indexOf("#__", pos1 + 3);
- if (pos2 != -1)
- {
- String id = text.substring(pos1 + 3, pos2);
- String locStr;
- locStr = (String)sb.get(id.equals("@font") || id.equals("@fontsize") ? id + fontSuffix : id);
- if (locStr == null)
- locStr = "";
- int locLen = locStr.length();
-
- String begin, end;
- if (pos1 > 0)
- begin = text.substring(0, pos1);
- else
- begin = "";
- end = text.substring(pos2 + 3);
- text = begin + locStr + end;
-
- len = len - 6 - id.length() + locLen;
- i = pos1 + locLen;
- }
- else
- i = len;
- }
- else
- i = len;
- }
- return text;
- }
-
- public static String GetString(String id, String locale)
- {
- Hashtable sb = null;
- try
- {
- sb = GetStringBundle(locale);
- }
- catch (Exception e)
- {
- return "";
- }
- String s = (String)sb.get(id);
- if (s == null)
- return "";
- return s;
- }
-
- protected static Hashtable GetStringBundle(String locale)
- {
- if (locale.equals(""))
- locale = english;
- else
- locale = locale.toLowerCase();
-
- if (!languages.containsKey(locale))
- {
- BufferedReader in = null;
- try
- {
- File f = new File(localizationPath + locale);
- if (!f.exists())
- {
- // requested locale is not supported, default to English
- if (languages.containsKey(english))
- return (Hashtable)languages.get(english);
- f = new File(localizationPath + english);
- }
- in = new BufferedReader(new InputStreamReader(new FileInputStream(f), "UTF-8"));
- String line;
- Hashtable sb = new Hashtable();
- while ((line = in.readLine()) != null)
- {
- line = line.trim();
- if (line.equals("") || line.charAt(0) == '#')
- continue;
- int sep = line.indexOf('=');
- if (sep == -1)
- continue;
- String key = line.substring(0, sep).trim();
- if (key.equals(""))
- continue;
- sb.put(key, line.substring(sep + 1).trim());
- }
- languages.put(locale, sb);
- }
- catch (Exception e)
- {
- return null;
- }
- finally
- {
- if (in != null)
- {
- try { in.close(); }
- catch (Exception e) { }
- }
- }
- }
- return (Hashtable)languages.get(locale);
- }
-
-}
Copied: trunk/MgDev/Web/src/JavaApiEx/org/osgeo/mapguide/MgLocalizer.java (from rev 7251, sandbox/jng/swig-java/Web/src/JavaApiEx/org/osgeo/mapguide/MgLocalizer.java)
===================================================================
--- trunk/MgDev/Web/src/JavaApiEx/org/osgeo/mapguide/MgLocalizer.java (rev 0)
+++ trunk/MgDev/Web/src/JavaApiEx/org/osgeo/mapguide/MgLocalizer.java 2013-01-12 03:36:03 UTC (rev 7297)
@@ -0,0 +1,154 @@
+/*
+ Copyright (C) 2004-2011 by Autodesk, Inc.
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of version 2.1 of the GNU Lesser
+ General Public License as published by the Free Software Foundation.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+
+package org.osgeo.mapguide;
+
+import java.util.*;
+import java.io.*;
+
+public class MgLocalizer
+{
+ protected static String english = "en";
+ protected static String localizationPath = "";
+ protected static Hashtable languages = new Hashtable();
+
+ public static void SetLocalizedFilesPath(String path)
+ {
+ localizationPath = path;
+ }
+
+ public static String Localize(String text, String locale, int os)
+ {
+ String fontSuffix = (os==0? "Windows": (os==1? "Macintosh": "Linux"));
+ Hashtable sb = null;
+ try
+ {
+ sb = GetStringBundle(locale);
+ }
+ catch (Exception e)
+ {
+ return "";
+ }
+ int len = text.length();
+
+ for (int i = 0; i < len; )
+ {
+ int pos1 = text.indexOf("__#", i);
+ if (pos1 != -1)
+ {
+ int pos2 = text.indexOf("#__", pos1 + 3);
+ if (pos2 != -1)
+ {
+ String id = text.substring(pos1 + 3, pos2);
+ String locStr;
+ locStr = (String)sb.get(id.equals("@font") || id.equals("@fontsize") ? id + fontSuffix : id);
+ if (locStr == null)
+ locStr = "";
+ int locLen = locStr.length();
+
+ String begin, end;
+ if (pos1 > 0)
+ begin = text.substring(0, pos1);
+ else
+ begin = "";
+ end = text.substring(pos2 + 3);
+ text = begin + locStr + end;
+
+ len = len - 6 - id.length() + locLen;
+ i = pos1 + locLen;
+ }
+ else
+ i = len;
+ }
+ else
+ i = len;
+ }
+ return text;
+ }
+
+ public static String GetString(String id, String locale)
+ {
+ Hashtable sb = null;
+ try
+ {
+ sb = GetStringBundle(locale);
+ }
+ catch (Exception e)
+ {
+ return "";
+ }
+ String s = (String)sb.get(id);
+ if (s == null)
+ return "";
+ return s;
+ }
+
+ protected static Hashtable GetStringBundle(String locale)
+ {
+ if (locale.equals(""))
+ locale = english;
+ else
+ locale = locale.toLowerCase();
+
+ if (!languages.containsKey(locale))
+ {
+ BufferedReader in = null;
+ try
+ {
+ File f = new File(localizationPath + locale);
+ if (!f.exists())
+ {
+ // requested locale is not supported, default to English
+ if (languages.containsKey(english))
+ return (Hashtable)languages.get(english);
+ f = new File(localizationPath + english);
+ }
+ in = new BufferedReader(new InputStreamReader(new FileInputStream(f), "UTF-8"));
+ String line;
+ Hashtable sb = new Hashtable();
+ while ((line = in.readLine()) != null)
+ {
+ line = line.trim();
+ if (line.equals("") || line.charAt(0) == '#')
+ continue;
+ int sep = line.indexOf('=');
+ if (sep == -1)
+ continue;
+ String key = line.substring(0, sep).trim();
+ if (key.equals(""))
+ continue;
+ sb.put(key, line.substring(sep + 1).trim());
+ }
+ languages.put(locale, sb);
+ }
+ catch (Exception e)
+ {
+ return null;
+ }
+ finally
+ {
+ if (in != null)
+ {
+ try { in.close(); }
+ catch (Exception e) { }
+ }
+ }
+ }
+ return (Hashtable)languages.get(locale);
+ }
+
+}
Modified: trunk/MgDev/Web/src/Makefile.am
===================================================================
--- trunk/MgDev/Web/src/Makefile.am 2013-01-09 19:09:42 UTC (rev 7296)
+++ trunk/MgDev/Web/src/Makefile.am 2013-01-12 03:36:03 UTC (rev 7297)
@@ -1,6 +1,6 @@
AUTOMAKE_OPTIONS = foreign
-SUBDIRS = WebApp WebSupport HttpHandler CgiAgent PhpApi JavaApi ApacheAgent
-DIST_SUBDIRS = WebApp WebSupport HttpHandler CgiAgent PhpApi JavaApi ApacheAgent
+SUBDIRS = WebApp WebSupport HttpHandler CgiAgent PhpApi JavaApi JavaApiEx ApacheAgent
+DIST_SUBDIRS = WebApp WebSupport HttpHandler CgiAgent PhpApi JavaApi JavaApiEx ApacheAgent
EXTRA_DIST = MapGuideApi DotNetApi DotNetUnmanagedApi mapviewernet mapviewerjava mapviewerphp mapadmin mapagent stdicons viewerfiles WebTier.sln webconfig.ini WEB-INF localized schemareport webstudio PostBuild
prefix=@prefix@/webserverextensions/www
Modified: trunk/MgDev/Web/src/MapGuideApi/MapGuideApiGen.xml
===================================================================
--- trunk/MgDev/Web/src/MapGuideApi/MapGuideApiGen.xml 2013-01-09 19:09:42 UTC (rev 7296)
+++ trunk/MgDev/Web/src/MapGuideApi/MapGuideApiGen.xml 2013-01-12 03:36:03 UTC (rev 7297)
@@ -9,6 +9,7 @@
Target section.
-->
<Target path="./MapGuideApi.i" />
+<DocTarget path="./MapGuideApi_Doc.i" />
<!--
C++ inline section.
@@ -51,6 +52,7 @@
Swig inline section.
-->
<SwigInline>
+ %include "MapGuideApi_Doc.i" //translated doxygen fragments
%include "language.i" //typemaps specific for each language
%include "../../../Common/Foundation/System/FoundationClassId.h"
%include "../../../Common/Geometry/GeometryClassId.h"
Modified: trunk/MgDev/Web/src/WebTier_VS2010.sln
===================================================================
--- trunk/MgDev/Web/src/WebTier_VS2010.sln 2013-01-09 19:09:42 UTC (rev 7296)
+++ trunk/MgDev/Web/src/WebTier_VS2010.sln 2013-01-12 03:36:03 UTC (rev 7297)
@@ -60,6 +60,8 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebDotNetApi", "DotNetApi\Web\WebDotNetApi.vcxproj", "{41F3263B-C16C-49E8-ADF6-416DFB55C9E2}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JavaApiEx", "JavaApiEx\JavaApiEx.vcxproj", "{C02F44CB-D916-428D-A1A5-04E225A2A4EC}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -308,6 +310,14 @@
{41F3263B-C16C-49E8-ADF6-416DFB55C9E2}.Release|Win32.Build.0 = Release|Win32
{41F3263B-C16C-49E8-ADF6-416DFB55C9E2}.Release|x64.ActiveCfg = Release|x64
{41F3263B-C16C-49E8-ADF6-416DFB55C9E2}.Release|x64.Build.0 = Release|x64
+ {C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Debug|Win32.ActiveCfg = Debug|Win32
+ {C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Debug|Win32.Build.0 = Debug|Win32
+ {C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Debug|x64.ActiveCfg = Debug|x64
+ {C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Debug|x64.Build.0 = Debug|x64
+ {C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Release|Win32.ActiveCfg = Release|Win32
+ {C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Release|Win32.Build.0 = Release|Win32
+ {C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Release|x64.ActiveCfg = Release|x64
+ {C02F44CB-D916-428D-A1A5-04E225A2A4EC}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Modified: trunk/MgDev/build.bat
===================================================================
--- trunk/MgDev/build.bat 2013-01-09 19:09:42 UTC (rev 7296)
+++ trunk/MgDev/build.bat 2013-01-12 03:36:03 UTC (rev 7297)
@@ -388,8 +388,6 @@
echo [install]: Copy dlls into .net samples
%XCOPY% "%MG_OUTPUT_WEB%\www\mapviewernet\bin\*.dll" "%MG_OUTPUT_WEB%\www\dotnetsamples\bin" /EXCLUDE:svn_excludes.txt+%TYPEBUILD%_excludes.txt
%XCOPY% "%MG_OUTPUT_WEB%\www\mapviewernet\bin\*.dll" "%MG_OUTPUT_WEB%\www\dotnetviewersample\bin" /EXCLUDE:svn_excludes.txt+%TYPEBUILD%_excludes.txt
-echo [build]: .net intellisense files
-DoxyTransform.exe dotnet "%MG_DOC_XML%" "%MG_OUTPUT_WEB%\www\mapviewernet\bin"
goto quit
:error
Modified: trunk/MgDev/build64.bat
===================================================================
--- trunk/MgDev/build64.bat 2013-01-09 19:09:42 UTC (rev 7296)
+++ trunk/MgDev/build64.bat 2013-01-12 03:36:03 UTC (rev 7297)
@@ -420,8 +420,6 @@
echo [install]: Copy dlls into .net samples
%XCOPY% "%MG_OUTPUT_WEB%\www\mapviewernet\bin\*.dll" "%MG_OUTPUT_WEB%\www\dotnetsamples\bin" /EXCLUDE:svn_excludes.txt+%TYPEBUILD%_excludes.txt
%XCOPY% "%MG_OUTPUT_WEB%\www\mapviewernet\bin\*.dll" "%MG_OUTPUT_WEB%\www\dotnetviewersample\bin" /EXCLUDE:svn_excludes.txt+%TYPEBUILD%_excludes.txt
-echo [build]: .net intellisense files
-DoxyTransform.exe dotnet "%MG_DOC_XML%" "%MG_OUTPUT_WEB%\www\mapviewernet\bin"
goto quit
:error
Modified: trunk/MgDev/configure.in
===================================================================
--- trunk/MgDev/configure.in 2013-01-09 19:09:42 UTC (rev 7296)
+++ trunk/MgDev/configure.in 2013-01-12 03:36:03 UTC (rev 7297)
@@ -240,6 +240,7 @@
Web/src/WebApp/Makefile \
Web/src/WebSupport/Makefile \
Web/src/JavaApi/Makefile \
+ Web/src/JavaApiEx/Makefile \
Web/src/PhpApi/Makefile \
Web/src/HttpHandler/Makefile \
Web/src/CgiAgent/Makefile \
More information about the mapguide-commits
mailing list