зеркало из https://github.com/mozilla/gecko-dev.git
more web service changes - return a complex data type, and add some output documentation to the deploy script
This commit is contained in:
Родитель
54006ffb2d
Коммит
774adac64f
|
@ -2,14 +2,78 @@ package org.mozilla.update.extensions;
|
|||
|
||||
public class Extension
|
||||
{
|
||||
public Extension()
|
||||
private int row;
|
||||
private java.lang.String id;
|
||||
private java.lang.String version;
|
||||
private java.lang.String name;
|
||||
private java.lang.String xpiURL;
|
||||
|
||||
public Extension()
|
||||
{
|
||||
}
|
||||
|
||||
public int row;
|
||||
public String id;
|
||||
public String version;
|
||||
public String name;
|
||||
public String xpiURL;
|
||||
public int getRow()
|
||||
{
|
||||
return row;
|
||||
}
|
||||
|
||||
public void setRow(int row)
|
||||
{
|
||||
this.row = row;
|
||||
}
|
||||
|
||||
public java.lang.String getId()
|
||||
{
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(java.lang.String id)
|
||||
{
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public java.lang.String getVersion()
|
||||
{
|
||||
return version;
|
||||
}
|
||||
|
||||
public void setVersion(java.lang.String version)
|
||||
{
|
||||
this.version = version;
|
||||
}
|
||||
|
||||
public java.lang.String getName()
|
||||
{
|
||||
return name;
|
||||
}
|
||||
|
||||
public void setName(java.lang.String name)
|
||||
{
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public java.lang.String getXpiURL()
|
||||
{
|
||||
return xpiURL;
|
||||
}
|
||||
|
||||
public void setXpiURL(java.lang.String xpiURL)
|
||||
{
|
||||
this.xpiURL = xpiURL;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
//public class Extension
|
||||
//{
|
||||
// public Extension()
|
||||
// {
|
||||
// }
|
||||
//
|
||||
// public int row;
|
||||
// public String id;
|
||||
// public String version;
|
||||
// public String name;
|
||||
// public String xpiURL;
|
||||
//}
|
||||
|
||||
|
|
|
@ -46,12 +46,14 @@ public class VersionCheck
|
|||
{
|
||||
}
|
||||
|
||||
/*
|
||||
public static void main(String[] args) throws Exception
|
||||
{
|
||||
VersionCheck impl = new VersionCheck();
|
||||
int id = impl.getNewestExtension("{bb8ee064-ccb9-47fc-94ae-ec335af3fe2d}", "3.0", "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}", "0.8.0+");
|
||||
System.out.println("result = " + impl.getProperty(id, "xpiurl"));
|
||||
}
|
||||
*/
|
||||
|
||||
protected Connection getConnection() throws Exception
|
||||
{
|
||||
|
@ -63,11 +65,12 @@ public class VersionCheck
|
|||
{
|
||||
int id = getNewestExtension(aExtensionGUID, aInstalledVersion, aTargetApp, aTargetAppVersion);
|
||||
Extension e = new Extension();
|
||||
e.row = id;
|
||||
e.id = getProperty(id, "id");
|
||||
e.version = getProperty(id, "version");
|
||||
e.name = getProperty(id, "name");
|
||||
e.xpiURL = getProperty(id, "xpiurl");
|
||||
|
||||
e.setRow(id);
|
||||
e.setId(getProperty(id, "id"));
|
||||
e.setVersion(getProperty(id, "version"));
|
||||
e.setName(getProperty(id, "name"));
|
||||
e.setXpiURL(getProperty(id, "xpiurl"));
|
||||
|
||||
return e;
|
||||
}
|
||||
|
|
|
@ -41,6 +41,7 @@ cd "$sAXIS_HOME"
|
|||
#
|
||||
#mkdir -p $pkg_dir || exit 1
|
||||
cp -f "$srcdir"/*.java "$sAXIS_HOME/$pkg_dir"
|
||||
echo "Compiling original source files..."
|
||||
javac "$pkg_dir"/*.java || exit 1
|
||||
|
||||
#
|
||||
|
@ -51,12 +52,12 @@ java org.apache.axis.wsdl.Java2WSDL -o "$AXIS_HOME\\$pkg_dir\\$name.wsdl" \
|
|||
-p"$pkg" "urn:$name" $pkg.$name || exit 1
|
||||
|
||||
java org.apache.axis.wsdl.WSDL2Java -o . \
|
||||
-d Session -s -S true -Nurn:$name $pkg $name.wsdl || exit 1
|
||||
-d Session -s -S true -Nurn:$name $pkg "$AXIS_HOME\\$pkg_dir\\$name.wsdl" || exit 1
|
||||
|
||||
#
|
||||
# verify results! ;-)
|
||||
#
|
||||
if [ ! -f "$name.wsdl" -o ! -f "$pkg_dir/"$name"SoapBindingImpl.java" ]; then
|
||||
if [ ! -f "$AXIS_HOME\\$pkg_dir\\$name.wsdl" -o ! -f "$pkg_dir/"$name"SoapBindingImpl.java" ]; then
|
||||
echo "something went wrong!"
|
||||
exit 1
|
||||
fi
|
||||
|
@ -77,6 +78,7 @@ regexp="s/public class ${name}SoapBindingImpl/public class ${name}SoapBindingImp
|
|||
sed -e "$regexp" $pkg_dir/${name}SoapBindingImpl.java > $pkg_dir/temp.java
|
||||
mv $pkg_dir/temp.java "$pkg_dir/${name}SoapBindingImpl.java"
|
||||
|
||||
echo "Compiling generated source files..."
|
||||
javac "$pkg_dir\*.java" || exit 1
|
||||
cd "$sAXIS_HOME/$pkg_dir"
|
||||
cp *.class "$sCATALINA_HOME/webapps/axis/WEB-INF/classes/$pkg_dir"
|
||||
|
|
Загрузка…
Ссылка в новой задаче