Revision 718
| org.gvsig.tools/library/trunk/org.gvsig.tools/org.gvsig.tools.lib/src/main/java/org/gvsig/installer/lib/api/Dependency.java | ||
|---|---|---|
| 1 | 1 |
package org.gvsig.installer.lib.api; |
| 2 | 2 |
|
| 3 | 3 |
import org.gvsig.tools.lang.Cloneable; |
| 4 |
import org.gvsig.tools.packageutils.Version;; |
|
| 5 | 4 |
|
| 6 | 5 |
|
| 7 | 6 |
/** |
| ... | ... | |
| 17 | 16 |
public final String CONFLICT = "conflict"; |
| 18 | 17 |
public final String RECOMMENDED = "recommended"; |
| 19 | 18 |
|
| 20 |
public org.gvsig.tools.packageutils.Dependency parse(String dependency);
|
|
| 19 |
public Dependency parse(String dependency); |
|
| 21 | 20 |
|
| 22 | 21 |
public String getType(); |
| 23 | 22 |
|
| org.gvsig.tools/library/trunk/org.gvsig.tools/org.gvsig.tools.lib/src/main/java/org/gvsig/installer/lib/api/Version.java | ||
|---|---|---|
| 13 | 13 |
*/ |
| 14 | 14 |
public interface Version extends Cloneable {
|
| 15 | 15 |
|
| 16 |
public org.gvsig.tools.packageutils.Version parse(String version);
|
|
| 16 |
public Version parse(String version); |
|
| 17 | 17 |
|
| 18 |
public int getMayor(); |
|
| 18 |
public int getMajor(); |
|
| 19 |
|
|
| 20 |
/** |
|
| 21 |
* @deprecated Use {@link #getMajor()}
|
|
| 22 |
*/ |
|
| 23 |
public int getMayor(); |
|
| 19 | 24 |
|
| 20 | 25 |
public int getMinor(); |
| 21 | 26 |
|
| ... | ... | |
| 25 | 30 |
|
| 26 | 31 |
public int getBuild(); |
| 27 | 32 |
|
| 28 |
public boolean check(String op, org.gvsig.tools.packageutils.Version other);
|
|
| 33 |
public boolean check(String op, Version other); |
|
| 29 | 34 |
|
| 30 | 35 |
public String fullFormat(); |
| 31 | 36 |
|
| 32 | 37 |
/** |
| 33 | 38 |
* @deprecated don't use, set only in parse |
| 34 | 39 |
*/ |
| 35 |
public org.gvsig.tools.packageutils.Version setBuild(int build);
|
|
| 40 |
public Version setBuild(int build); |
|
| 36 | 41 |
|
| 37 | 42 |
} |
| org.gvsig.tools/library/trunk/org.gvsig.tools/org.gvsig.tools.lib/src/main/java/org/gvsig/installer/lib/api/Dependencies.java | ||
|---|---|---|
| 3 | 3 |
import java.util.List; |
| 4 | 4 |
|
| 5 | 5 |
import org.gvsig.tools.lang.Cloneable; |
| 6 |
import org.gvsig.tools.packageutils.Dependency; |
|
| 7 |
import org.gvsig.tools.packageutils.Version;; |
|
| 8 | 6 |
|
| 9 | 7 |
/** |
| 10 | 8 |
* |
| ... | ... | |
| 14 | 12 |
* @deprecated use #org.gvsig.tools.packageutils.Dependencies |
| 15 | 13 |
*/ |
| 16 | 14 |
public interface Dependencies extends List, Cloneable {
|
| 17 |
public org.gvsig.tools.packageutils.Dependencies parse(String dependenies); |
|
| 15 |
|
|
| 16 |
public Dependencies parse(String dependenies); |
|
| 18 | 17 |
|
| 19 | 18 |
public boolean match(String type, String code, Version version); |
| 20 | 19 |
|
| org.gvsig.tools/library/trunk/org.gvsig.tools/org.gvsig.tools.lib/src/main/java/org/gvsig/installer/lib/api/PackageInfo.java | ||
|---|---|---|
| 8 | 8 |
import org.gvsig.tools.exception.BaseException; |
| 9 | 9 |
import org.gvsig.tools.lang.Cloneable; |
| 10 | 10 |
import org.gvsig.tools.task.SimpleTaskStatus; |
| 11 |
import org.gvsig.tools.packageutils.Dependencies; |
|
| 12 |
import org.gvsig.tools.packageutils.Version; |
|
| 13 | 11 |
|
| 14 | 12 |
import org.gvsig.tools.packageutils.PackageManager.ARCH; |
| 15 | 13 |
import org.gvsig.tools.packageutils.PackageManager.JVM; |
| ... | ... | |
| 261 | 259 |
|
| 262 | 260 |
public boolean isBroken(); |
| 263 | 261 |
|
| 264 |
/** |
|
| 265 |
* |
|
| 266 |
* @return |
|
| 267 |
*/ |
|
| 268 |
public String getPostInstallScript(); |
|
| 262 |
|
|
| 263 |
|
|
| 269 | 264 |
|
| 265 |
|
|
| 266 |
|
|
| 267 |
|
|
| 268 |
|
|
| 270 | 269 |
/** |
| 271 | 270 |
* |
| 272 |
* @param script
|
|
| 273 |
* @return
|
|
| 271 |
* @param version
|
|
| 272 |
* @deprecated Use {@link #setVersion(Version)}
|
|
| 274 | 273 |
*/ |
| 275 |
public void setPostInstallScript(String script); |
|
| 274 |
public void setVersion(String version); |
|
| 275 |
|
|
| 276 | 276 |
|
| 277 |
public void setValue(String name, Object value); |
|
| 278 |
|
|
| 279 |
public Object getValue(String name); |
|
| 280 |
|
|
| 281 |
public String getPreferedPackageFileName(); |
|
| 282 |
|
|
| 283 |
|
|
| 284 |
|
|
| 285 |
|
|
| 286 |
|
|
| 287 |
|
|
| 288 | 277 |
/** |
| 289 | 278 |
* @return Gets the build number of the package. |
| 290 | 279 |
* @deprecated use {@link #getVersion()}.getBuild()
|
| org.gvsig.tools/library/trunk/org.gvsig.tools/org.gvsig.tools.lib/src/main/java/org/gvsig/tools/packageutils/Version.java | ||
|---|---|---|
| 4 | 4 |
|
| 5 | 5 |
public interface Version extends Cloneable, org.gvsig.installer.lib.api.Version {
|
| 6 | 6 |
|
| 7 |
public Version parse(String version); |
|
| 7 |
public org.gvsig.installer.lib.api.Version parse(String version);
|
|
| 8 | 8 |
|
| 9 |
public int getMayor();
|
|
| 9 |
public int getMajor();
|
|
| 10 | 10 |
|
| 11 | 11 |
public int getMinor(); |
| 12 | 12 |
|
| ... | ... | |
| 16 | 16 |
|
| 17 | 17 |
public int getBuild(); |
| 18 | 18 |
|
| 19 |
public boolean check(String op, Version other); |
|
| 19 |
public boolean check(String op, org.gvsig.installer.lib.api.Version other);
|
|
| 20 | 20 |
|
| 21 | 21 |
public String fullFormat(); |
| 22 | 22 |
} |
| org.gvsig.tools/library/trunk/org.gvsig.tools/org.gvsig.tools.lib/src/main/java/org/gvsig/tools/packageutils/Dependencies.java | ||
|---|---|---|
| 4 | 4 |
import org.gvsig.tools.lang.Cloneable; |
| 5 | 5 |
|
| 6 | 6 |
public interface Dependencies extends List, Cloneable, org.gvsig.installer.lib.api.Dependencies {
|
| 7 |
public Dependencies parse(String dependenies); |
|
| 7 |
public org.gvsig.installer.lib.api.Dependencies parse(String dependenies);
|
|
| 8 | 8 |
|
| 9 |
public boolean match(String type, String code, Version version); |
|
| 9 |
public boolean match(String type, String code, org.gvsig.installer.lib.api.Version version);
|
|
| 10 | 10 |
|
| 11 |
public Dependency find(String type, String code, Version version);
|
|
| 11 |
public org.gvsig.installer.lib.api.Dependency find(String type, String code, org.gvsig.installer.lib.api.Version version);
|
|
| 12 | 12 |
|
| 13 | 13 |
} |
| org.gvsig.tools/library/trunk/org.gvsig.tools/org.gvsig.tools.lib/src/main/java/org/gvsig/tools/packageutils/PackageInfo.java | ||
|---|---|---|
| 30 | 30 |
import java.net.URL; |
| 31 | 31 |
import java.util.List; |
| 32 | 32 |
|
| 33 |
import org.gvsig.installer.lib.api.Version; |
|
| 34 |
import org.gvsig.installer.lib.api.Dependencies; |
|
| 33 | 35 |
|
| 36 |
|
|
| 34 | 37 |
public interface PackageInfo extends org.gvsig.installer.lib.api.PackageInfo {
|
| 35 | 38 |
|
| 36 | 39 |
|
| org.gvsig.tools/library/trunk/org.gvsig.tools/org.gvsig.tools.lib/src/main/java/org/gvsig/tools/packageutils/Dependency.java | ||
|---|---|---|
| 1 | 1 |
package org.gvsig.tools.packageutils; |
| 2 | 2 |
|
| 3 | 3 |
import org.gvsig.tools.lang.Cloneable; |
| 4 |
import org.gvsig.installer.lib.api.Version; |
|
| 4 | 5 |
|
| 5 | 6 |
public interface Dependency extends Cloneable, org.gvsig.installer.lib.api.Dependency {
|
| 6 | 7 |
public final String REQUIRED = "required"; |
| 7 | 8 |
public final String CONFLICT = "conflict"; |
| 8 | 9 |
public final String RECOMMENDED = "recommended"; |
| 9 | 10 |
|
| 10 |
public Dependency parse(String dependency); |
|
| 11 |
public org.gvsig.installer.lib.api.Dependency parse(String dependency);
|
|
| 11 | 12 |
|
| 12 | 13 |
public String getType(); |
| 13 | 14 |
|
| org.gvsig.tools/library/trunk/org.gvsig.tools/org.gvsig.tools.lib/src/main/java/org/gvsig/tools/packageutils/impl/DefaultDependency.java | ||
|---|---|---|
| 6 | 6 |
import org.gvsig.tools.exception.BaseRuntimeException; |
| 7 | 7 |
import org.gvsig.tools.packageutils.Dependency; |
| 8 | 8 |
import org.gvsig.tools.packageutils.PackageInfo; |
| 9 |
import org.gvsig.tools.packageutils.Version;
|
|
| 9 |
import org.gvsig.installer.lib.api.Version;
|
|
| 10 | 10 |
|
| 11 | 11 |
public class DefaultDependency implements Dependency {
|
| 12 | 12 |
|
| ... | ... | |
| 40 | 40 |
this.version = ToolsLocator.getPackageManager().createVersion(); |
| 41 | 41 |
} |
| 42 | 42 |
|
| 43 |
public Dependency parse(String dependency) {
|
|
| 43 |
public org.gvsig.installer.lib.api.Dependency parse(String dependency) {
|
|
| 44 | 44 |
// Parse a string with the dependency specification |
| 45 | 45 |
// (required|suggested|recommended|conflict)[:] code (=|>|<|>=|<=) |
| 46 | 46 |
// version |
| org.gvsig.tools/library/trunk/org.gvsig.tools/org.gvsig.tools.lib/src/main/java/org/gvsig/tools/packageutils/impl/DefaultVersion.java | ||
|---|---|---|
| 7 | 7 |
|
| 8 | 8 |
public class DefaultVersion implements Version {
|
| 9 | 9 |
|
| 10 |
private int mayor = 0;
|
|
| 10 |
private int major = 0;
|
|
| 11 | 11 |
private int minor = 0; |
| 12 | 12 |
private int rev = 0; |
| 13 | 13 |
private String classifier = null; |
| ... | ... | |
| 20 | 20 |
protected DefaultVersion(int mayor, int minor, int rev, String classifier, |
| 21 | 21 |
int build) {
|
| 22 | 22 |
this(); |
| 23 |
this.mayor = mayor;
|
|
| 23 |
this.major = mayor;
|
|
| 24 | 24 |
this.minor = minor; |
| 25 | 25 |
this.rev = rev; |
| 26 | 26 |
this.classifier = classifier; |
| 27 | 27 |
this.build = build; |
| 28 | 28 |
} |
| 29 | 29 |
|
| 30 |
public Version parse(String version) {
|
|
| 30 |
public org.gvsig.installer.lib.api.Version parse(String version) {
|
|
| 31 | 31 |
if( version == null || version.length()==0 ) {
|
| 32 |
this.mayor = 0;
|
|
| 32 |
this.major = 0;
|
|
| 33 | 33 |
this.minor = 0; |
| 34 | 34 |
this.rev = 0; |
| 35 | 35 |
this.classifier = null; |
| ... | ... | |
| 41 | 41 |
String[] x = version.split("[.]");
|
| 42 | 42 |
int lx = x.length; |
| 43 | 43 |
if (lx == 1) {
|
| 44 |
this.mayor = parseIntClassifierAndBuild(x[0], version);
|
|
| 44 |
this.major = parseIntClassifierAndBuild(x[0], version);
|
|
| 45 | 45 |
this.minor = 0; |
| 46 | 46 |
this.rev = 0; |
| 47 | 47 |
this.classifier = null; |
| 48 | 48 |
this.build = 0; |
| 49 | 49 |
} else if (lx == 2) {
|
| 50 |
this.mayor = Integer.parseInt(x[0]);
|
|
| 50 |
this.major = Integer.parseInt(x[0]);
|
|
| 51 | 51 |
this.minor = parseIntClassifierAndBuild(x[1], version); |
| 52 | 52 |
this.rev = 0; |
| 53 | 53 |
this.classifier = null; |
| 54 | 54 |
this.build = 0; |
| 55 | 55 |
} else if (lx == 3) {
|
| 56 |
this.mayor = Integer.parseInt(x[0]);
|
|
| 56 |
this.major = Integer.parseInt(x[0]);
|
|
| 57 | 57 |
this.minor = Integer.parseInt(x[1]); |
| 58 | 58 |
this.rev = parseIntClassifierAndBuild(x[2], version); |
| 59 | 59 |
} else {
|
| ... | ... | |
| 90 | 90 |
return value; |
| 91 | 91 |
} |
| 92 | 92 |
|
| 93 |
public int getMayor() {
|
|
| 94 |
return this.mayor;
|
|
| 93 |
public int getMajor() {
|
|
| 94 |
return this.major;
|
|
| 95 | 95 |
} |
| 96 |
|
|
| 96 | 97 |
|
| 98 |
public int getMayor() {
|
|
| 99 |
return getMajor(); |
|
| 100 |
} |
|
| 101 |
|
|
| 97 | 102 |
public int getMinor() {
|
| 98 | 103 |
return this.minor; |
| 99 | 104 |
} |
| ... | ... | |
| 110 | 115 |
return this.build; |
| 111 | 116 |
} |
| 112 | 117 |
|
| 113 |
public boolean check(String op, Version other) {
|
|
| 118 |
public boolean check(String op, org.gvsig.installer.lib.api.Version other) {
|
|
| 114 | 119 |
if ("=".equals(op) || "==".equals(op) || "-eq".equals(op)) {
|
| 115 | 120 |
return this.fullFormat().compareTo(other.fullFormat()) == 0; |
| 116 | 121 |
} |
| ... | ... | |
| 133 | 138 |
if (this.classifier == null) {
|
| 134 | 139 |
return MessageFormat.format("{0}.{1}.{2}-{3,number,####}",
|
| 135 | 140 |
new Object[] {
|
| 136 |
new Integer(this.mayor),
|
|
| 141 |
new Integer(this.major),
|
|
| 137 | 142 |
new Integer(this.minor), |
| 138 | 143 |
new Integer(this.rev), |
| 139 | 144 |
new Integer(this.build) |
| ... | ... | |
| 142 | 147 |
} else {
|
| 143 | 148 |
return MessageFormat.format("{0}.{1}.{2}-{3}-{4,number,####}",
|
| 144 | 149 |
new Object[] {
|
| 145 |
new Integer(this.mayor),
|
|
| 150 |
new Integer(this.major),
|
|
| 146 | 151 |
new Integer(this.minor), |
| 147 | 152 |
new Integer(this.rev), |
| 148 | 153 |
this.classifier, |
| ... | ... | |
| 158 | 163 |
return MessageFormat.format( |
| 159 | 164 |
"{0,number,0000}.{1,number,0000}.{2,number,0000}-AAAA-{3,number,0000}",
|
| 160 | 165 |
new Object[] {
|
| 161 |
new Integer(this.mayor),
|
|
| 166 |
new Integer(this.major),
|
|
| 162 | 167 |
new Integer(this.minor), |
| 163 | 168 |
new Integer(this.rev), |
| 164 | 169 |
new Integer(this.build) |
| ... | ... | |
| 168 | 173 |
return MessageFormat.format( |
| 169 | 174 |
"{0,number,0000}.{1,number,0000}.{2,number,0000}-{3}-{4,number,0000}",
|
| 170 | 175 |
new Object[] {
|
| 171 |
new Integer(this.mayor),
|
|
| 176 |
new Integer(this.major),
|
|
| 172 | 177 |
new Integer(this.minor), |
| 173 | 178 |
new Integer(this.rev), |
| 174 | 179 |
this.classifier, |
| ... | ... | |
| 184 | 189 |
|
| 185 | 190 |
public boolean equals(Object obj) {
|
| 186 | 191 |
Version other = (Version) obj; |
| 187 |
if (this.mayor != other.getMayor()) {
|
|
| 192 |
if (this.major != other.getMajor()) {
|
|
| 188 | 193 |
return false; |
| 189 | 194 |
} |
| 190 | 195 |
if (this.minor != other.getMinor()) {
|
| ... | ... | |
| 211 | 216 |
|
| 212 | 217 |
public int hashCode() {
|
| 213 | 218 |
return (classifier == null ? 0 : classifier.hashCode()) + |
| 214 |
(mayor<<13) + (minor<<19) + (rev<<25) + build;
|
|
| 219 |
(major<<13) + (minor<<19) + (rev<<25) + build;
|
|
| 215 | 220 |
} |
| 216 | 221 |
|
| 217 |
public Version setBuild(int build) {
|
|
| 222 |
public org.gvsig.installer.lib.api.Version setBuild(int build) {
|
|
| 218 | 223 |
this.build = build; |
| 219 | 224 |
return this; |
| 220 | 225 |
} |
| org.gvsig.tools/library/trunk/org.gvsig.tools/org.gvsig.tools.lib/src/main/java/org/gvsig/tools/packageutils/impl/DefaultDependencies.java | ||
|---|---|---|
| 5 | 5 |
|
| 6 | 6 |
import org.gvsig.tools.ToolsLocator; |
| 7 | 7 |
import org.gvsig.tools.packageutils.Dependencies; |
| 8 |
import org.gvsig.tools.packageutils.Dependency;
|
|
| 8 |
import org.gvsig.installer.lib.api.Dependency;
|
|
| 9 | 9 |
import org.gvsig.tools.packageutils.PackageManager; |
| 10 |
import org.gvsig.tools.packageutils.Version;
|
|
| 10 |
import org.gvsig.installer.lib.api.Version;
|
|
| 11 | 11 |
|
| 12 | 12 |
public class DefaultDependencies extends ArrayList implements |
| 13 | 13 |
Dependencies {
|
| ... | ... | |
| 38 | 38 |
} |
| 39 | 39 |
|
| 40 | 40 |
|
| 41 |
public Dependencies parse(String dependecies) {
|
|
| 41 |
public org.gvsig.installer.lib.api.Dependencies parse(String dependecies) {
|
|
| 42 | 42 |
if (dependecies == null) {
|
| 43 | 43 |
this.clear(); |
| 44 | 44 |
return this; |
| org.gvsig.tools/library/trunk/org.gvsig.tools/org.gvsig.tools.lib/src/main/java/org/gvsig/tools/packageutils/impl/DefaultPackageInfo.java | ||
|---|---|---|
| 39 | 39 |
|
| 40 | 40 |
import org.gvsig.tools.ToolsLocator; |
| 41 | 41 |
import org.gvsig.tools.exception.BaseException; |
| 42 |
import org.gvsig.tools.packageutils.Dependencies;
|
|
| 42 |
import org.gvsig.installer.lib.api.Dependencies;
|
|
| 43 | 43 |
import org.gvsig.tools.packageutils.PackageInfo; |
| 44 | 44 |
import org.gvsig.tools.packageutils.PackageManager; |
| 45 | 45 |
import org.gvsig.tools.packageutils.PackageManager.ARCH; |
| 46 | 46 |
import org.gvsig.tools.packageutils.PackageManager.JVM; |
| 47 | 47 |
import org.gvsig.tools.packageutils.PackageManager.OS; |
| 48 | 48 |
import org.gvsig.tools.packageutils.PackageManager.STATE; |
| 49 |
import org.gvsig.tools.packageutils.Version;
|
|
| 49 |
import org.gvsig.installer.lib.api.Version;
|
|
| 50 | 50 |
import org.gvsig.tools.task.SimpleTaskStatus; |
| 51 | 51 |
import org.slf4j.Logger; |
| 52 | 52 |
import org.slf4j.LoggerFactory; |
| ... | ... | |
| 688 | 688 |
public void checkSignature(byte[] pkgdata) {
|
| 689 | 689 |
// Do nothing |
| 690 | 690 |
} |
| 691 |
|
|
| 692 |
/* (non-Javadoc) |
|
| 693 |
* @see org.gvsig.installer.lib.api.PackageInfo#setVersion(java.lang.String) |
|
| 694 |
*/ |
|
| 695 |
public void setVersion(String version) {
|
|
| 696 |
this.version.parse(version); |
|
| 697 |
} |
|
| 691 | 698 |
} |
Also available in: Unified diff