5 files changed, 0 insertions, 406 deletions
diff --git a/src/org/traccar/web/shared/model/ApplicationSettings.java b/src/org/traccar/web/shared/model/ApplicationSettings.java
deleted file mode 100644
index 6f5bfe5..0000000
--- a/src/org/traccar/web/shared/model/ApplicationSettings.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.traccar.web.shared.model;
-
-import java.io.Serializable;
-
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-@Entity
-@Table(name="application_settings")
-public class ApplicationSettings implements Serializable {
-
-    private static final long serialVersionUID = 1;
-
-    @Id
-    @GeneratedValue
-    private long id;
-
-    public ApplicationSettings() {
-        registrationEnabled = true;
-    }
-
-    private boolean registrationEnabled;
-
-    public void setRegistrationEnabled(boolean registrationEnabled) {
-        this.registrationEnabled = registrationEnabled;
-    }
-
-    public boolean getRegistrationEnabled() {
-        return registrationEnabled;
-    }
-
-}
diff --git a/src/org/traccar/web/shared/model/Device.java b/src/org/traccar/web/shared/model/Device.java
deleted file mode 100644
index 6f6d6c5..0000000
--- a/src/org/traccar/web/shared/model/Device.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright 2013 Anton Tananaev (anton.tananaev@gmail.com)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.traccar.web.shared.model;
-
-import java.io.Serializable;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-
-@Entity
-@Table(name = "devices")
-public class Device implements Serializable {
-
-    private static final long serialVersionUID = 1;
-
-    public Device() {
-    }
-
-    public Device(Device device) {
-        id = device.id;
-        uniqueId = device.uniqueId;
-        name = device.name;
-    }
-
-    @Id
-    @GeneratedValue
-    private long id;
-
-    public long getId() {
-        return id;
-    }
-
-    @OneToOne(fetch = FetchType.EAGER)
-    private Position latestPosition;
-
-    public void setLatestPosition(Position latestPosition) {
-        this.latestPosition = latestPosition;
-    }
-
-    public Position getLatestPosition() {
-        return latestPosition;
-    }
-
-    @Column(unique = true)
-    private String uniqueId;
-
-    public void setUniqueId(String uniqueId) {
-        this.uniqueId = uniqueId;
-    }
-
-    public String getUniqueId() {
-        return uniqueId;
-    }
-
-    private String name;
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-}
diff --git a/src/org/traccar/web/shared/model/Position.java b/src/org/traccar/web/shared/model/Position.java
deleted file mode 100644
index d9ec3b3..0000000
--- a/src/org/traccar/web/shared/model/Position.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright 2013 Anton Tananaev (anton.tananaev@gmail.com)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.traccar.web.shared.model;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
-import org.hibernate.annotations.Index;
-
-@Entity
-@Table(name = "positions")
-public class Position implements Serializable, Cloneable {
-
-    private static final long serialVersionUID = 1;
-
-    public Position() {
-    }
-
-    public Position(Position position) {
-        id = position.id;
-        device = position.device;
-        time = position.time;
-        valid = position.valid;
-        latitude = position.latitude;
-        longitude = position.longitude;
-        altitude = position.altitude;
-        speed = position.speed;
-        course = position.course;
-        power = position.power;
-        address = position.address;
-        other = position.other;
-    }
-
-    @Id
-    @GeneratedValue
-    private long id;
-
-    public long getId() {
-        return id;
-    }
-
-    @ManyToOne(fetch = FetchType.EAGER)
-    @Index(name = "positionsIndex")
-    private Device device;
-
-    public Device getDevice() {
-        return device;
-    }
-
-    @Index(name = "positionsIndex")
-    private Date time;
-
-    public Date getTime() {
-        return time;
-    }
-
-    private Boolean valid;
-
-    public Boolean getValid() {
-        return valid;
-    }
-
-    private Double latitude;
-
-    public Double getLatitude() {
-        return latitude;
-    }
-
-    private Double longitude;
-
-    public Double getLongitude() {
-        return longitude;
-    }
-
-    private Double altitude;
-
-    public Double getAltitude() {
-        return altitude;
-    }
-
-    private Double speed;
-
-    public Double getSpeed() {
-        return speed;
-    }
-
-    private Double course;
-
-    public Double getCourse() {
-        return course;
-    }
-
-    private Double power;
-
-    public Double getPower() {
-        return power;
-    }
-
-    private String address;
-
-    public String getAddress() {
-        return address;
-    }
-
-    private String other;
-
-    public String getOther() {
-        return other;
-    }
-
-}
diff --git a/src/org/traccar/web/shared/model/User.java b/src/org/traccar/web/shared/model/User.java
deleted file mode 100644
index 20adc12..0000000
--- a/src/org/traccar/web/shared/model/User.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright 2013 Anton Tananaev (anton.tananaev@gmail.com)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.traccar.web.shared.model;
-
-import java.io.Serializable;
-import java.util.LinkedList;
-import java.util.List;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-
-import com.google.gwt.user.client.rpc.GwtTransient;
-
-@Entity
-@Table(name="users")
-public class User implements Serializable, Cloneable {
-
-    private static final long serialVersionUID = 1;
-
-    public User() {
-        admin = false;
-    }
-
-    public User(User user) {
-        id = user.id;
-        login = user.login;
-        password = user.password;
-        admin = user.admin;
-    }
-
-    @Id
-    @GeneratedValue
-    private long id;
-
-    public long getId() {
-        return id;
-    }
-
-    @Column(unique = true)
-    private String login;
-
-    public void setLogin(String login) {
-        this.login = login;
-    }
-
-    public String getLogin() {
-        return login;
-    }
-
-    private String password;
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    // TODO temporary nullable to migrate from old database
-    private Boolean admin;
-
-    public void setAdmin(boolean admin) {
-        this.admin = admin;
-    }
-
-    public boolean getAdmin() {
-        // TODO temporary nullable to migrate from old database
-        return (admin == null) ? false : admin;
-    }
-
-    @GwtTransient
-    @OneToMany(fetch = FetchType.EAGER)
-    private List<Device> devices = new LinkedList<Device>();
-
-    public void setDevices(List<Device> devices) {
-        this.devices = devices;
-    }
-
-    public List<Device> getDevices() {
-        return devices;
-    }
-
-    @OneToOne(cascade = CascadeType.ALL)
-    private UserSettings userSettings;
-
-    public void setUserSettings(UserSettings userSettings) {
-        this.userSettings = userSettings;
-    }
-
-    public UserSettings getUserSettings() {
-        return userSettings;
-    }
-
-}
diff --git a/src/org/traccar/web/shared/model/UserSettings.java b/src/org/traccar/web/shared/model/UserSettings.java
deleted file mode 100644
index 3f6deea..0000000
--- a/src/org/traccar/web/shared/model/UserSettings.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.traccar.web.shared.model;
-
-import java.io.Serializable;
-
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-@Entity
-@Table(name="user_settings")
-public class UserSettings implements Serializable {
-
-    private static final long serialVersionUID = 1;
-
-    @Id
-    @GeneratedValue
-    private long id;
-
-    public UserSettings() {
-        speedUnit = SpeedUnit.knots;
-    }
-
-    public enum SpeedUnit {
-        knots,
-        kilometersPerHour,
-        milesPerHour
-    }
-
-    @Enumerated(EnumType.STRING)
-    private SpeedUnit speedUnit;
-
-    public void setSpeedUnit(SpeedUnit speedUnit) {
-        this.speedUnit = speedUnit;
-    }
-
-    public SpeedUnit getSpeedUnit() {
-        return speedUnit;
-    }
-
-}