rpms/josm/F-12 REVISION.XML, NONE, 1.1 import.log, NONE, 1.1 josm, NONE, 1.1 josm-0-add_javadoc.patch, NONE, 1.1 josm-0-bzip2.patch, NONE, 1.1 josm-0-disable_oauth.patch, NONE, 1.1 josm-0-remove_svn_call.patch, NONE, 1.1 josm-generate-tarball.sh, NONE, 1.1 josm.1, NONE, 1.1 josm.desktop, NONE, 1.1 josm.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Cédric OLIVIER
cquad at fedoraproject.org
Fri Jun 18 16:03:43 UTC 2010
- Previous message: [pkgdb] perl-Test-MockTime (Fedora EPEL, 6) updated by tibbs
- Next message: rpms/josm/F-13 REVISION.XML, NONE, 1.1 import.log, NONE, 1.1 josm, NONE, 1.1 josm-0-add_javadoc.patch, NONE, 1.1 josm-0-bzip2.patch, NONE, 1.1 josm-0-disable_oauth.patch, NONE, 1.1 josm-0-remove_svn_call.patch, NONE, 1.1 josm-generate-tarball.sh, NONE, 1.1 josm.1, NONE, 1.1 josm.desktop, NONE, 1.1 josm.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: cquad
Update of /cvs/pkgs/rpms/josm/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv19164/F-12
Modified Files:
.cvsignore sources
Added Files:
REVISION.XML import.log josm josm-0-add_javadoc.patch
josm-0-bzip2.patch josm-0-disable_oauth.patch
josm-0-remove_svn_call.patch josm-generate-tarball.sh josm.1
josm.desktop josm.spec
Log Message:
--- NEW FILE REVISION.XML ---
<?xml version="1.0"?>
<info>
<entry
kind="dir"
path="."
revision="3329">
<url>http://josm.openstreetmap.de/svn/trunk</url>
<repository>
<root>http://josm.openstreetmap.de/svn</root>
<uuid>0c6e7542-c601-0410-84e7-c038aed88b3b</uuid>
</repository>
<wc-info>
<schedule>normal</schedule>
<depth>infinity</depth>
</wc-info>
<commit
revision="3329">
<author>stoecker</author>
<date>2010-06-10T07:53:42.765279Z</date>
</commit>
</entry>
</info>
--- NEW FILE import.log ---
josm-0-0_6_3329svn_fc13:F-12:josm-0-0.6.3329svn.fc13.src.rpm:1276876919
--- NEW FILE josm ---
#!/bin/sh
# Simple wrapper script used to start JOSM
java $JAVA_OPTS -jar /usr/share/java/josm.jar "$@"
josm-0-add_javadoc.patch:
build.xml | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
--- NEW FILE josm-0-add_javadoc.patch ---
--- build.xml.origine2 2010-06-15 10:52:24.000000000 +0200
+++ build.xml 2010-06-15 21:50:38.924117353 +0200
@@ -230,5 +230,21 @@
</target>
+ <target name="javadoc" description="generate javadoc documentation">
+ <javadoc
+ destdir="javadoc"
+ defaultexcludes="yes"
+ author="true"
+ version="true"
+ use="true"
+ access="protected"
+ windowtitle="josm javadoc"
+ failonerror="true">
+ <packageset dir="src">
+ <include name="org/openstreetmap/josm/gui"/>
+ <exclude name="org.xnap.*" />
+ </packageset>
+ </javadoc>
+ </target>
</project>
josm-0-bzip2.patch:
build.xml | 2 ++
1 file changed, 2 insertions(+)
--- NEW FILE josm-0-bzip2.patch ---
--- build.xml.origine 2010-06-18 07:19:08.494841000 +0200
+++ build.xml 2010-06-18 07:20:34.369841100 +0200
@@ -54,6 +54,8 @@
<!-- All jar files necessary to run only JOSM (no tests) -->
<zipfileset src="lib/metadata-extractor-2.3.1-nosun.jar" />
+ <zipfileset src="/usr/share/java/ant.jar" />
+ <zipfileset src="/usr/share/java/commons-codec.jar" />
</jar>
</target>
josm-0-disable_oauth.patch:
build.xml | 4 -
src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java | 15 ++--
src/org/openstreetmap/josm/gui/MainApplication.java | 4 -
src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java | 14 +++-
src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java | 10 ++-
src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java | 31 +++++++---
src/org/openstreetmap/josm/io/OsmConnection.java | 14 ++--
src/org/openstreetmap/josm/io/auth/CredentialsManager.java | 6 -
src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java | 8 +-
src/org/openstreetmap/josm/tools/ExceptionUtil.java | 10 ++-
10 files changed, 80 insertions(+), 36 deletions(-)
--- NEW FILE josm-0-disable_oauth.patch ---
diff -uNr josm-origine/build.xml josm-0/build.xml
--- josm-origine/build.xml 2010-06-15 22:43:34.244992770 +0200
+++ josm-0/build.xml 2010-06-15 22:42:34.288117927 +0200
@@ -54,7 +54,6 @@
<!-- All jar files necessary to run only JOSM (no tests) -->
<zipfileset src="lib/metadata-extractor-2.3.1-nosun.jar" />
- <zipfileset src="lib/signpost-core-1.1.jar" />
</jar>
</target>
@@ -74,7 +73,8 @@
<target name="compile" depends="init">
<javac srcdir="src" classpathref="classpath" destdir="build"
- target="1.5" source="1.5" debug="on" encoding="UTF-8">
+ target="1.5" source="1.5" debug="on" encoding="UTF-8"
+ excludes="org/openstreetmap/josm/gui/oauth/,org/openstreetmap/josm/data/oauth/">
<compilerarg value="-Xlint:deprecation"/>
<compilerarg value="-Xlint:unchecked"/>
</javac>
diff -uNr josm-origine/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java josm-0/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java
--- josm-origine/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java 2010-05-15 21:57:19.000000000 +0200
+++ josm-0/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java 2010-06-15 22:41:22.492992808 +0200
@@ -15,7 +15,7 @@
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.io.ChangesetClosedException;
import org.openstreetmap.josm.io.IllegalDataException;
-import org.openstreetmap.josm.io.MissingOAuthAccessTokenException;
+//import org.openstreetmap.josm.io.MissingOAuthAccessTokenException;
import org.openstreetmap.josm.io.OsmApiException;
import org.openstreetmap.josm.io.OsmApiInitializationException;
import org.openstreetmap.josm.io.OsmTransferException;
@@ -249,11 +249,13 @@
public static void explainAuthenticationFailed(OsmApiException e) {
String authMethod = Main.pref.get("osm-server.auth-method", "basic");
String msg;
+ /*
if (authMethod.equals("oauth")) {
msg = ExceptionUtil.explainFailedOAuthAuthentication(e);
} else {
+ */
msg = ExceptionUtil.explainFailedBasicAuthentication(e);
- }
+ //}
HelpAwareOptionPane.showOptionDialog(
Main.parent,
@@ -273,7 +275,7 @@
public static void explainAuthorizationFailed(OsmApiException e) {
HelpAwareOptionPane.showOptionDialog(
Main.parent,
- ExceptionUtil.explainFailedOAuthAuthorisation(e),
+ tr("OAuth authorization disabled by Fedora."),
tr("Authorisation Failed"),
JOptionPane.ERROR_MESSAGE,
ht("/ErrorMessages#AuthenticationFailed")
@@ -318,7 +320,7 @@
*
* @param e the exception
*/
- public static void explainMissingOAuthAccessTokenException(MissingOAuthAccessTokenException e) {
+/* public static void explainMissingOAuthAccessTokenException(MissingOAuthAccessTokenException e) {
HelpAwareOptionPane.showOptionDialog(
Main.parent,
ExceptionUtil.explainMissingOAuthAccessTokenException(e),
@@ -327,6 +329,7 @@
ht("/ErrorMessages#MissingOAuthAccessToken")
);
}
+*/
/**
* Explains a {@see UnknownHostException} which has caused an {@see OsmTransferException}.
@@ -404,10 +407,10 @@
return;
}
- if (e instanceof MissingOAuthAccessTokenException) {
+/* if (e instanceof MissingOAuthAccessTokenException) {
explainMissingOAuthAccessTokenException((MissingOAuthAccessTokenException)e);
return;
- }
+ }*/
if (e instanceof OsmApiException) {
OsmApiException oae = (OsmApiException) e;
diff -uNr josm-origine/src/org/openstreetmap/josm/gui/MainApplication.java josm-0/src/org/openstreetmap/josm/gui/MainApplication.java
--- josm-origine/src/org/openstreetmap/josm/gui/MainApplication.java 2010-05-30 17:07:19.000000000 +0200
+++ josm-0/src/org/openstreetmap/josm/gui/MainApplication.java 2010-06-15 22:41:22.493993190 +0200
@@ -24,7 +24,7 @@
import javax.swing.JFrame;
import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.preferences.server.OAuthAccessTokenHolder;
+//import org.openstreetmap.josm.gui.preferences.server.OAuthAccessTokenHolder;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
import org.openstreetmap.josm.io.DefaultProxySelector;
import org.openstreetmap.josm.io.auth.CredentialsManagerFactory;
@@ -177,7 +177,7 @@
DefaultAuthenticator.createInstance(CredentialsManagerFactory.getCredentialManager());
Authenticator.setDefault(DefaultAuthenticator.getInstance());
ProxySelector.setDefault(new DefaultProxySelector(ProxySelector.getDefault()));
- OAuthAccessTokenHolder.getInstance().init(Main.pref, CredentialsManagerFactory.getCredentialManager());
+// OAuthAccessTokenHolder.getInstance().init(Main.pref, CredentialsManagerFactory.getCredentialManager());
// asking for help? show help and exit
if (args.containsKey("help")) {
diff -uNr josm-origine/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java josm-0/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java
--- josm-origine/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java 2010-03-05 10:54:39.000000000 +0100
+++ josm-0/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java 2010-06-15 22:41:22.494992795 +0200
@@ -39,7 +39,7 @@
/** the panel for the basic authentication parameters */
private BasicAuthenticationPreferencesPanel pnlBasicAuthPreferences;
/** the panel for the OAuth authentication parameters */
- private OAuthAuthenticationPreferencesPanel pnlOAuthPreferences;
+// private OAuthAuthenticationPreferencesPanel pnlOAuthPreferences;
/**
* builds the UI
@@ -66,6 +66,7 @@
add(rbOAuth = new JRadioButton(), gc);
rbOAuth.setText(tr("Use OAuth"));
rbOAuth.setToolTipText(tr("Select to use OAuth as authentication mechanism"));
+ rbOAuth.setEnabled(false);
rbOAuth.addItemListener(authChangeListener);
//-- radio button for OAuth
@@ -85,7 +86,7 @@
//-- the two panel for authentication parameters
pnlBasicAuthPreferences = new BasicAuthenticationPreferencesPanel();
- pnlOAuthPreferences = new OAuthAuthenticationPreferencesPanel();
+// pnlOAuthPreferences = new OAuthAuthenticationPreferencesPanel();
rbBasicAuthentication.setSelected(true);
pnlAuthenticationParameteters.add(pnlBasicAuthPreferences, BorderLayout.CENTER);
@@ -107,7 +108,7 @@
rbBasicAuthentication.setSelected(true);
}
pnlBasicAuthPreferences.initFromPreferences();
- pnlOAuthPreferences.initFromPreferences();
+// pnlOAuthPreferences.initFromPreferences();
}
public void saveToPreferences() {
@@ -122,6 +123,7 @@
if (authMethod.equals("basic")) {
// save username and password and clear the OAuth token
pnlBasicAuthPreferences.saveToPreferences();
+/*
OAuthAccessTokenHolder.getInstance().clear();
OAuthAccessTokenHolder.getInstance().save(Main.pref, CredentialsManagerFactory.getCredentialManager());
} else if (authMethod.equals("oauth")) {
@@ -129,6 +131,7 @@
pnlBasicAuthPreferences.clearPassword();
pnlBasicAuthPreferences.saveToPreferences();
pnlOAuthPreferences.saveToPreferences();
+*/
}
}
@@ -141,18 +144,21 @@
pnlAuthenticationParameteters.removeAll();
pnlAuthenticationParameteters.add(pnlBasicAuthPreferences, BorderLayout.CENTER);
pnlBasicAuthPreferences.revalidate();
- } else {
+/* } else {
pnlAuthenticationParameteters.removeAll();
pnlAuthenticationParameteters.add(pnlOAuthPreferences, BorderLayout.CENTER);
pnlOAuthPreferences.revalidate();
+*/
}
repaint();
}
}
public void propertyChange(PropertyChangeEvent evt) {
+/*
if (pnlOAuthPreferences != null) {
pnlOAuthPreferences.propertyChange(evt);
}
+*/
}
}
diff -uNr josm-origine/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java josm-0/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java
--- josm-origine/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java 2010-03-05 10:54:39.000000000 +0100
+++ josm-0/src/org/openstreetmap/josm/gui/preferences/server/OAuthAccessTokenHolder.java 2010-06-15 22:41:22.494992795 +0200
@@ -6,7 +6,7 @@
import java.util.logging.Logger;
import org.openstreetmap.josm.data.Preferences;
-import org.openstreetmap.josm.data.oauth.OAuthToken;
+//import org.openstreetmap.josm.data.oauth.OAuthToken;
import org.openstreetmap.josm.io.auth.CredentialsManager;
import org.openstreetmap.josm.io.auth.CredentialsManagerException;
import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -90,11 +90,13 @@
this.accessTokenSecret = accessTokenSecret;
}
+/*
public OAuthToken getAccessToken() {
if (!containsAccessToken())
return null;
return new OAuthToken(accessTokenKey, accessTokenSecret);
}
+*/
/**
* Sets the access token hold by this holder.
@@ -112,6 +114,7 @@
*
* @param token the access token. Can be null to clear the content in this holder.
*/
+/*
public void setAccessToken(OAuthToken token) {
if (token == null) {
this.accessTokenKey = null;
@@ -121,6 +124,7 @@
this.accessTokenSecret = token.getSecret();
}
}
+*/
/**
* Replies true if this holder contains an complete access token, consisting of an
@@ -143,6 +147,7 @@
public void init(Preferences pref, CredentialsManager cm) throws IllegalArgumentException {
CheckParameterUtil.ensureParameterNotNull(pref, "pref");
CheckParameterUtil.ensureParameterNotNull(cm, "cm");
+/*
OAuthToken token = null;
try {
token = cm.lookupOAuthAccessToken();
@@ -156,6 +161,7 @@
accessTokenKey = token.getKey();
accessTokenSecret = token.getSecret();
}
+*/
}
/**
@@ -171,6 +177,7 @@
CheckParameterUtil.ensureParameterNotNull(preferences, "preferences");
CheckParameterUtil.ensureParameterNotNull(cm, "cm");
preferences.put("oauth.access-token.save-to-preferences", saveToPreferences);
+/*
try {
if (!saveToPreferences) {
cm.storeOAuthAccessToken(null);
@@ -182,6 +189,7 @@
System.err.println(tr("Warning: Failed to store OAuth Access Token to credentials manager"));
System.err.println(tr("Current credential manager is of type ''{0}''", cm.getClass().getName()));
}
+*/
}
/**
diff -uNr josm-origine/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java josm-0/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java
--- josm-origine/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java 2010-03-05 10:54:39.000000000 +0100
+++ josm-0/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java 2010-06-15 22:41:22.495992797 +0200
@@ -25,13 +25,17 @@
import javax.swing.JTextField;
import org.openstreetmap.josm.Main;
+/*
import org.openstreetmap.josm.data.oauth.OAuthParameters;
import org.openstreetmap.josm.data.oauth.OAuthToken;
+*/
import org.openstreetmap.josm.gui.JMultilineLabel;
import org.openstreetmap.josm.gui.SideButton;
+/*
import org.openstreetmap.josm.gui.oauth.AdvancedOAuthPropertiesPanel;
import org.openstreetmap.josm.gui.oauth.OAuthAuthorizationWizard;
import org.openstreetmap.josm.gui.oauth.TestAccessTokenTask;
+*/
import org.openstreetmap.josm.io.auth.CredentialsManagerFactory;
import org.openstreetmap.josm.tools.ImageProvider;
@@ -50,7 +54,7 @@
private JPanel pnlAuthorisationMessage;
private NotYetAuthorisedPanel pnlNotYetAuthorised;
private AlreadyAuthorisedPanel pnlAlreadyAuthorised;
- private AdvancedOAuthPropertiesPanel pnlAdvancedProperties;
+// private AdvancedOAuthPropertiesPanel pnlAdvancedProperties;
private String apiUrl;
private JCheckBox cbShowAdvancedParameters;
private JCheckBox cbSaveToPreferences;
@@ -73,7 +77,7 @@
cbShowAdvancedParameters.addItemListener(
new ItemListener() {
public void itemStateChanged(ItemEvent evt) {
- pnlAdvancedProperties.setVisible(evt.getStateChange() == ItemEvent.SELECTED);
+// pnlAdvancedProperties.setVisible(evt.getStateChange() == ItemEvent.SELECTED);
}
}
);
@@ -90,6 +94,7 @@
gc.fill = GridBagConstraints.BOTH;
gc.weightx = 1.0;
gc.weighty = 1.0;
+/*
pnl.add(pnlAdvancedProperties = new AdvancedOAuthPropertiesPanel(), gc);
pnlAdvancedProperties.initFromPreferences(Main.pref);
pnlAdvancedProperties.setBorder(
@@ -99,6 +104,7 @@
)
);
pnlAdvancedProperties.setVisible(false);
+*/
return pnl;
}
@@ -129,14 +135,15 @@
protected void refreshView() {
pnlAuthorisationMessage.removeAll();
- if (OAuthAccessTokenHolder.getInstance().containsAccessToken()) {
+/* if (OAuthAccessTokenHolder.getInstance().containsAccessToken()) {
pnlAuthorisationMessage.add(pnlAlreadyAuthorised, BorderLayout.CENTER);
pnlAlreadyAuthorised.refreshView();
pnlAlreadyAuthorised.revalidate();
} else {
+*/
pnlAuthorisationMessage.add(pnlNotYetAuthorised, BorderLayout.CENTER);
pnlNotYetAuthorised.revalidate();
- }
+// }
repaint();
}
@@ -163,9 +170,11 @@
* Saves the current values to preferences
*/
public void saveToPreferences() {
+/*
OAuthAccessTokenHolder.getInstance().setSaveToPreferences(cbSaveToPreferences.isSelected());
OAuthAccessTokenHolder.getInstance().save(Main.pref, CredentialsManagerFactory.getCredentialManager());
pnlAdvancedProperties.getAdvancedParameters().saveToPreferences(Main.pref);
+*/
}
/**
@@ -256,7 +265,7 @@
gc.gridwidth = 2;
gc.weightx = 1.0;
add(cbSaveToPreferences = new JCheckBox(tr("Save to preferences")), gc);
- cbSaveToPreferences.setSelected(OAuthAccessTokenHolder.getInstance().isSaveToPreferences());
+// cbSaveToPreferences.setSelected(OAuthAccessTokenHolder.getInstance().isSaveToPreferences());
// -- action buttons
JPanel btns = new JPanel(new FlowLayout(FlowLayout.LEFT));
@@ -285,11 +294,12 @@
}
public void refreshView() {
- String v = OAuthAccessTokenHolder.getInstance().getAccessTokenKey();
+/* String v = OAuthAccessTokenHolder.getInstance().getAccessTokenKey();
tfAccessTokenKey.setText(v == null? "" : v);
v = OAuthAccessTokenHolder.getInstance().getAccessTokenSecret();
tfAccessTokenSecret.setText(v == null? "" : v);
cbSaveToPreferences.setSelected(OAuthAccessTokenHolder.getInstance().isSaveToPreferences());
+*/
}
public AlreadyAuthorisedPanel() {
@@ -309,7 +319,7 @@
}
public void actionPerformed(ActionEvent arg0) {
- OAuthAuthorizationWizard wizard = new OAuthAuthorizationWizard(
+/* OAuthAuthorizationWizard wizard = new OAuthAuthorizationWizard(
OAuthAuthenticationPreferencesPanel.this,
apiUrl
);
@@ -320,7 +330,8 @@
holder.setSaveToPreferences(wizard.isSaveAccessTokenToPreferences());
pnlAdvancedProperties.setAdvancedParameters(wizard.getOAuthParameters());
refreshView();
- }
+*/
+ }
}
/**
@@ -334,6 +345,7 @@
}
public void actionPerformed(ActionEvent arg0) {
+/*
OAuthAuthorizationWizard wizard = new OAuthAuthorizationWizard(
OAuthAuthenticationPreferencesPanel.this,
apiUrl
@@ -345,6 +357,7 @@
holder.setSaveToPreferences(wizard.isSaveAccessTokenToPreferences());
pnlAdvancedProperties.setAdvancedParameters(wizard.getOAuthParameters());
refreshView();
+*/
}
}
@@ -360,6 +373,7 @@
}
public void actionPerformed(ActionEvent evt) {
+/*
OAuthToken token = OAuthAccessTokenHolder.getInstance().getAccessToken();
OAuthParameters parameters = OAuthParameters.createFromPreferences(Main.pref);
TestAccessTokenTask task = new TestAccessTokenTask(
@@ -369,6 +383,7 @@
token
);
Main.worker.submit(task);
+*/
}
}
diff -uNr josm-origine/src/org/openstreetmap/josm/io/auth/CredentialsManager.java josm-0/src/org/openstreetmap/josm/io/auth/CredentialsManager.java
--- josm-origine/src/org/openstreetmap/josm/io/auth/CredentialsManager.java 2010-03-05 10:54:39.000000000 +0100
+++ josm-0/src/org/openstreetmap/josm/io/auth/CredentialsManager.java 2010-06-15 22:41:22.495992797 +0200
@@ -4,7 +4,7 @@
import java.net.PasswordAuthentication;
import java.net.Authenticator.RequestorType;
-import org.openstreetmap.josm.data.oauth.OAuthToken;
+//import org.openstreetmap.josm.data.oauth.OAuthToken;
/**
* A CredentialManager manages two credentials:
@@ -57,7 +57,7 @@
* @return the current OAuth Access Token to access the OSM server.
* @throws CredentialsManagerException thrown if something goes wrong
*/
- public OAuthToken lookupOAuthAccessToken() throws CredentialsManagerException;
+// public OAuthToken lookupOAuthAccessToken() throws CredentialsManagerException;
/**
* Stores the OAuth Access Token <code>accessToken</code>.
@@ -65,5 +65,5 @@
* @param accessToken the access Token. null, to remove the Access Token.
* @throws CredentialsManagerException thrown if something goes wrong
*/
- public void storeOAuthAccessToken(OAuthToken accessToken) throws CredentialsManagerException;
+// public void storeOAuthAccessToken(OAuthToken accessToken) throws CredentialsManagerException;
}
diff -uNr josm-origine/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java josm-0/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java
--- josm-origine/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java 2010-03-05 10:54:39.000000000 +0100
+++ josm-0/src/org/openstreetmap/josm/io/auth/JosmPreferencesCredentialManager.java 2010-06-15 22:41:22.496992824 +0200
@@ -5,7 +5,7 @@
import java.net.Authenticator.RequestorType;
import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.oauth.OAuthToken;
+//import org.openstreetmap.josm.data.oauth.OAuthToken;
import org.openstreetmap.josm.gui.io.CredentialDialog;
import org.openstreetmap.josm.gui.preferences.server.ProxyPreferencesPanel;
@@ -112,6 +112,7 @@
* @return the current OAuth Access Token to access the OSM server.
* @throws CredentialsManagerException thrown if something goes wrong
*/
+/*
public OAuthToken lookupOAuthAccessToken() throws CredentialsManagerException {
String accessTokenKey = Main.pref.get("oauth.access-token.key", null);
String accessTokenSecret = Main.pref.get("oauth.access-token.secret", null);
@@ -119,14 +120,14 @@
return null;
return new OAuthToken(accessTokenKey, accessTokenSecret);
}
-
+*/
/**
* Stores the OAuth Access Token <code>accessToken</code>.
*
* @param accessToken the access Token. null, to remove the Access Token.
* @throws CredentialsManagerException thrown if something goes wrong
*/
- public void storeOAuthAccessToken(OAuthToken accessToken) throws CredentialsManagerException {
+/* public void storeOAuthAccessToken(OAuthToken accessToken) throws CredentialsManagerException {
if (accessToken == null) {
Main.pref.put("oauth.access-token.key", null);
Main.pref.put("oauth.access-token.secret", null);
@@ -135,4 +136,5 @@
Main.pref.put("oauth.access-token.secret", accessToken.getSecret());
}
}
+*/
}
diff -uNr josm-origine/src/org/openstreetmap/josm/io/OsmConnection.java josm-0/src/org/openstreetmap/josm/io/OsmConnection.java
--- josm-origine/src/org/openstreetmap/josm/io/OsmConnection.java 2010-02-15 09:03:57.000000000 +0100
+++ josm-0/src/org/openstreetmap/josm/io/OsmConnection.java 2010-06-15 22:41:22.497992738 +0200
@@ -12,12 +12,12 @@
import java.nio.charset.CharsetEncoder;
import java.util.logging.Logger;
-import oauth.signpost.OAuthConsumer;
-import oauth.signpost.exception.OAuthException;
+//import oauth.signpost.OAuthConsumer;
+//import oauth.signpost.exception.OAuthException;
import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.oauth.OAuthParameters;
-import org.openstreetmap.josm.gui.preferences.server.OAuthAccessTokenHolder;
+//import org.openstreetmap.josm.data.oauth.OAuthParameters;
+//import org.openstreetmap.josm.gui.preferences.server.OAuthAccessTokenHolder;
import org.openstreetmap.josm.io.auth.CredentialsManagerException;
import org.openstreetmap.josm.io.auth.CredentialsManagerFactory;
import org.openstreetmap.josm.io.auth.CredentialsManagerResponse;
@@ -35,7 +35,7 @@
protected boolean cancel = false;
protected HttpURLConnection activeConnection;
- protected OAuthParameters oauthParameters;
+// protected OAuthParameters oauthParameters;
/**
* Initialize the http defaults and the authenticator.
@@ -111,6 +111,7 @@
* @throws OsmTransferException thrown if there is currently no OAuth Access Token configured
* @throws OsmTransferException thrown if signing fails
*/
+/*
protected void addOAuthAuthorizationHeader(HttpURLConnection connection) throws OsmTransferException {
if (oauthParameters == null) {
oauthParameters = OAuthParameters.createFromPreferences(Main.pref);
@@ -126,13 +127,16 @@
throw new OsmTransferException(tr("Failed to sign a HTTP connection with an OAuth Authentication header"), e);
}
}
+*/
protected void addAuth(HttpURLConnection connection) throws OsmTransferException {
String authMethod = Main.pref.get("osm-server.auth-method", "basic");
if (authMethod.equals("basic")) {
addBasicAuthorizationHeader(connection);
+/*
} else if (authMethod.equals("oauth")) {
addOAuthAuthorizationHeader(connection);
+*/
} else {
String msg = tr("Warning: unexpected value for preference ''{0}''. Got ''{1}''.", "osm-server.auth-method", authMethod);
System.err.println(msg);
diff -uNr josm-origine/src/org/openstreetmap/josm/tools/ExceptionUtil.java josm-0/src/org/openstreetmap/josm/tools/ExceptionUtil.java
--- josm-origine/src/org/openstreetmap/josm/tools/ExceptionUtil.java 2010-05-15 21:57:19.000000000 +0200
+++ josm-0/src/org/openstreetmap/josm/tools/ExceptionUtil.java 2010-06-15 22:41:22.497992738 +0200
@@ -18,10 +18,10 @@
import java.util.regex.Pattern;
import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.gui.preferences.server.OAuthAccessTokenHolder;
+//import org.openstreetmap.josm.gui.preferences.server.OAuthAccessTokenHolder;
import org.openstreetmap.josm.io.ChangesetClosedException;
import org.openstreetmap.josm.io.IllegalDataException;
-import org.openstreetmap.josm.io.MissingOAuthAccessTokenException;
+//import org.openstreetmap.josm.io.MissingOAuthAccessTokenException;
import org.openstreetmap.josm.io.OsmApi;
import org.openstreetmap.josm.io.OsmApiException;
import org.openstreetmap.josm.io.OsmApiInitializationException;
@@ -51,6 +51,7 @@
*
* @param e the exception
*/
+/*
public static String explainMissingOAuthAccessTokenException(MissingOAuthAccessTokenException e) {
e.printStackTrace();
String msg = tr(
@@ -63,6 +64,7 @@
);
return msg;
}
+*/
/**
* Explains a precondition exception when a child relation could not be deleted because
@@ -118,6 +120,7 @@
);
}
+/*
public static String explainFailedOAuthAuthentication(OsmApiException e) {
e.printStackTrace();
return tr("<html>"
@@ -127,7 +130,9 @@
OAuthAccessTokenHolder.getInstance().getAccessTokenKey()
);
}
+*/
+/*
public static String explainFailedOAuthAuthorisation(OsmApiException e) {
e.printStackTrace();
return tr("<html>"
@@ -140,6 +145,7 @@
e.getAccessedUrl() == null ? tr("unknown") : e.getAccessedUrl()
);
}
+*/
/**
* Explains an OSM API exception because of a client timeout (HTTP 408).
josm-0-remove_svn_call.patch:
build.xml | 47 +----------------------------------------------
1 file changed, 1 insertion(+), 46 deletions(-)
--- NEW FILE josm-0-remove_svn_call.patch ---
--- build.xml.orig 2010-05-08 17:44:45.000000000 +0200
+++ build.xml 2010-06-15 22:39:14.030118012 +0200
@@ -26,53 +26,8 @@
</fileset>
</path>
+ <target name="dist" depends="compile">
- <!--
- ** Used by Eclipse ant builder for updating
- ** the REVISION file used by JOSM
- -->
- <target name="create-revision-eclipse">
- <copy file="styles/standard/elemstyles.xml" todir="data"/>
- <property name="revision.dir" value="bin"/>
- <antcall target="create-revision" />
- </target>
-
- <!--
- ** Creates the REVISION file to be included in the distribution
- -->
- <target name="create-revision">
- <property name="revision.dir" value="${build.dir}"/>
- <exec append="false" output="REVISION.XML" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="info"/>
- <arg value="--xml"/>
- <arg value="."/>
- </exec>
- <xmlproperty file="REVISION.XML" prefix="version" keepRoot="false" collapseAttributes="true"/>
- <delete file="REVISION.XML" />
- <tstamp>
- <format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/>
- </tstamp>
-
- <property name="version.entry.commit.revision" value="UNKNOWN"/>
- <mkdir dir="${revision.dir}" />
- <echo file="${revision.dir}/REVISION">
-# automatically generated by JOSM build.xml - do not edit
-Revision: ${version.entry.commit.revision}
-Is-Local-Build: true
-Build-Date: ${build.tstamp}
-</echo>
- </target>
-
-
- <target name="dist" depends="compile,create-revision">
-
- <exec append="false" output="REVISION" executable="svn" failifexecutionfails="false">
- <env key="LANG" value="C"/>
- <arg value="info"/>
- <arg value="--xml"/>
- <arg value="."/>
- </exec>
<xmlproperty file="REVISION" prefix="version" keepRoot="false" collapseAttributes="true"/>
<delete file="REVISION"/>
<property name="version.entry.commit.revision" value="UNKNOWN"/>
--- NEW FILE josm-generate-tarball.sh ---
#!/bin/sh
if [ $# -ne 1 ]
then
echo Usage : ./josm-generate-tarball.sh JOSM_SVN_TAG
exit 1
fi
NAME_VERSION=josm-0
NAME=josm
JOSM_SVN_TAG=$1
# to know svn revision for josm translation, check it in MANIFEST.MF provided by josm svn in trunk/lib/josm-tranlsation.jar
# removing old sources files if exists
rm -rf ${NAME_VERSION}
# cheking out josm svn
svn -r ${JOSM_SVN_TAG} export http://josm.openstreetmap.de/svn/trunk/ ${NAME_VERSION}
# Delete org.apache.tools.bzip2, it can be found in buildrequires ant package
rm -r ${NAME_VERSION}/src/org/apache
# Add REVISION.XML to source files
cp ./REVISION.XML ${NAME_VERSION}/REVISION
# creating source tar
tar zcvf ${NAME_VERSION}.${JOSM_SVN_TAG}svn.tar.gz ${NAME_VERSION} #i18n plugins
# delete temporary directories
rm -rf ${NAME_VERSION} #i18n plugins
--- NEW FILE josm.1 ---
.TH JOSM 1 "September 8, 2007"
.\" Please adjust this date whenever revising the manpage.
.SH NAME
josm \- Java OpenStreetMap Editor
.SH SYNOPSIS
.B josm
.SH DESCRIPTION
.B josm
is an editor for OpenStreetMap written in Java 1.5.
.PP
.B OpenStreetMap
is a project aimed squarely at creating and providing free geographic data such as street maps to anyone
who wants them. It allows you to view, edit and use geographical data in a collaborative way from
anywhere on earth.
The project was started because most maps you think of as free actually have legal or technical
restrictions on their use, holding back people from using them in creative, productive or unexpected
ways.
.SH OPTIONS
.TP
.B \-h, \-?, \-\-help
Show help
.TP
.B \-\-geometry=<width>x<height>(+|-)x(+|-)y
Standard X geometry argument
.TP
.B [\-\-download=]minlat,minlon,maxlat,maxlon
Download the bounding box
.TP
.B [\-\-download=]<url>
Download the location at the url (with lat=x&lon=y&zoom=z)
.TP
.B [\-\-download=]<filename>
Open file (as raw gps, if .gpx)
.TP
.B \-\-downloadgps=minlat,minlon,maxlat,maxlon
Download the bounding box as raw gps
.TP
.B \-\-selection=<searchstring>
Select with the given search
.TP
.B \-\-no\-fullscreen
Don't launch in fullscreen mode
.TP
.B \-\-reset-preferences
Reset the preferences to the default
.TP
.B \-\-language=<language>
Set the language
.SH ENVIRONMENT
.IP JAVA_HOME
Specify an alternate Java environment.
.IP JAVA_OPTS
Specify Java options.
For example, to use a HTTP proxy server with this program, set this environment variable
to something like
.I JAVA_OPTS="-Dhttp.proxyHost=yourProxyURL"
before starting josm.
.SH SEE ALSO
.BR josm-plugins (1).
.SH AUTHOR
josm was written by Immanuel Scholz.
The current maintainer is Frederik Ramm.
.PP
This manual page was written by Andreas Putzo <andreas at putzo.net>,
for the Debian project (but may be used by others).
--- NEW FILE josm.desktop ---
[Desktop Entry]
Name=JOSM Map Editor
GenericName=Editor for OpenStreetMap maps
GenericName[fr]=Editeur de carte OpenStreetMap
Comment=Editor for OpenStreetMaps.org
Comment[fr]=Editeur pour OpenStreetMaps.org
Icon=josm
Exec=josm
Terminal=false
Type=Application
Categories=Education;Science;Geoscience;
--- NEW FILE josm.spec ---
#
# spec file for package josm
%global svn_revision 3329
Name: josm
Version: 0
Release: 0.6.%{svn_revision}svn%{?dist}
Summary: An editor for OpenStreetMap (OSM)
Group: Applications/Internet
License: GPLv2+
URL: http://josm.openstreetmap.de/
Source0: %{name}-%{version}.%{svn_revision}svn.tar.gz
Source1: %{name}
Source2: %{name}.desktop
Source3: %{name}-generate-tarball.sh
Source4: %{name}.1
Source5: REVISION.XML
#Source built using the following commands : ./josm-generate-tarball.sh 3329
#remove call to "svn info" and fix in build.xml revision and commit date
Patch0: %{name}-%{version}-remove_svn_call.patch
#patch to disable oauth, it is needed because oauth requires maven 2.0.9 and a maven > 2.0.8 seels to be only planned for F14
Patch1: %{name}-%{version}-disable_oauth.patch
#patch to add javadoc generation in build.xml
Patch2: %{name}-%{version}-add_javadoc.patch
#patch to use ant.jar (for bzip2) and commons-codec
Patch3: %{name}-%{version}-bzip2.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: jpackage-utils
BuildRequires: desktop-file-utils
BuildRequires: ant
BuildRequires: jakarta-commons-codec >= 1.3
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: gettext
BuildRequires: metadata-extractor >= 2.3.1
Requires: java >= 1:1.6.0
Requires: jpackage-utils
Requires: hicolor-icon-theme
Requires: metadata-extractor >= 2.3.1
%description
JOSM is an editor for OpenStreetMap (OSM) written in Java
Currently it supports loading stand alone GPX track data from the OSM database,
loading and editing existing nodes, ways, metadata tags and relations.
OpenStreetMap is a project aimed squarely at creating and providing
free geographic data such as street maps to anyone who wants them.
The project was started because most maps you think of as free actually
have legal or technical restrictions on their use, holding back people
from using them in creative, productive or unexpected ways.
%package javadoc
Summary: Javadocs for %{name}
Group: Documentation
Requires: %{name} = %{version}-%{release}
Requires: jpackage-utils
%description javadoc
This package contains the API documentation for %{name}.
%prep
%setup -q
%patch0 -p0
%patch1 -p1
%patch2 -p0
%patch3 -p0
find . -name '*.jar' -exec rm -f '{}' \;
find . -name '*.class' -exec rm -f '{}' \;
ln -s $(build-classpath metadata-extractor) lib/metadata-extractor-2.3.1-nosun.jar
iconv -f iso8859-15 -t utf-8 CONTRIBUTION > CONTRIBUTION.conv && mv -f CONTRIBUTION.conv CONTRIBUTION
%build
ant javadoc
ant
%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_javadir}
mkdir -p %{buildroot}%{_javadocdir}/%{name}
cp -rp javadoc \
%{buildroot}%{_javadocdir}/%{name}
install -p -m 644 dist/%{name}-custom.jar %{buildroot}%{_javadir}/%{name}-snapshot-%{svn_revision}svn.jar
ln -s %{name}-snapshot-%{svn_revision}svn.jar %{buildroot}%{_javadir}/%{name}.jar
install -Dp -m 755 %SOURCE1 %{buildroot}%{_bindir}/%{name}
install -d %{buildroot}%{_datadir}/icons/hicolor/128x128/apps
install -p -m 644 images/logo.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
install -Dp -m 644 %SOURCE4 %{buildroot}%{_mandir}/man1/%{name}.1
desktop-file-install --dir=%{buildroot}%{_datadir}/applications/ %SOURCE2
%clean
rm -rf %{buildroot}
%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
if [ $1 -eq 0 ] ; then
touch --no-create %{_datadir}/icons/hicolor &>/dev/null
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files
%defattr(-,root,root,-)
%doc README LICENSE CONTRIBUTION gpl-2.0.txt gpl-3.0.txt
%{_mandir}/man1/%{name}.1.gz
%{_javadir}/%{name}-snapshot-%{svn_revision}svn.jar
%{_javadir}/%{name}.jar
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
%files javadoc
%defattr(-,root,root,-)
%{_javadocdir}/%{name}
%changelog
* Fri Jun 18 2010 Cedric OLIVIER <cedric.olivier at free.fr> 0-0.6.3329svn
- jakarta-commons-codec.jar is deprecated in rawhide to commons-codec.jar
* Wed Jun 16 2010 Cedric OLIVIER <cedric.olivier at free.fr> 0-0.5.3329svn
- Update to 3329 svn revision
* Mon Jun 14 2010 Cedric OLIVIER <cedric.olivier at free.fr> 0-0.4.3208svn
- Convert CONTRIBUTION file from ISO8859-1 to UTF-8
* Fri Jun 11 2010 Cedric OLIVIER <cedric.olivier at free.fr> 0-0.3.3208svn
- Cosmetic Modifications in SPEC file
* Thu Jun 03 2010 Cedric OLIVIER <cedric.olivier at free.fr> 0-0.2.3208svn
- Remove an incorrect 755 in install -d directive
* Thu May 13 2010 Cedric OLIVIER <cedric.olivier at free.fr> 0-0.1.3208svn
- Update to 3208 svn revision
- Remove oauth waiting fedora include maven > 2.0.8 (needed for oauth build)
- Change license to GPLv2+ and add GPLv3 to %%doc
- Remove bzip2 and codec source to use of ant and jakarta-common-codec package
* Sun Mar 14 2010 Cedric OLIVIER <cedric.olivier at free.fr> 0-0.1.3094svn
- Update to 3094 svn revision
* Sat Nov 21 2009 Cedric OLIVIER <cedric.olivier at free.fr> 0-0.3.2255svn
- Add ScriptletSnippet for Icon Cache
- Change on man page section
* Sat Nov 14 2009 Cedric OLIVIER <cedric.olivier at free.fr> 0-0.2.2255svn
- Update of version number according GuideLines
* Fri Oct 16 2009 Cedric OLIVIER <cedric.olivier at free.fr> 0-0.1.2255svn
- Update to 2255 svn revision
* Fri Oct 09 2009 Cedric OLIVIER <cedric.olivier at free.fr> 0-0.1.2221svn
- Update to 2221 svn revision
- Add doc files
* Tue Aug 17 2009 Cedric OLIVIER <cedric.olivier at free.fr> 0-0.2.1788svn
- Add josm translation
* Sun Aug 02 2009 Cedric OLIVIER <cedric.olivier at free.fr> 0-0.1.1788svn
- Update to 1788 svn revision
- Remove jar files from sources
* Fri Jun 26 2009 Cedric OLIVIER <cedric.olivier at free.fr> 0-0.1.1607svn
- First release
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/josm/F-12/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore 16 Jun 2010 22:11:42 -0000 1.1
+++ .cvsignore 18 Jun 2010 16:03:42 -0000 1.2
@@ -0,0 +1 @@
+josm-0.3329svn.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/josm/F-12/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources 16 Jun 2010 22:11:42 -0000 1.1
+++ sources 18 Jun 2010 16:03:43 -0000 1.2
@@ -0,0 +1 @@
+9ef0717c35c09662c0c63dc6ef7cfab1 josm-0.3329svn.tar.gz
- Previous message: [pkgdb] perl-Test-MockTime (Fedora EPEL, 6) updated by tibbs
- Next message: rpms/josm/F-13 REVISION.XML, NONE, 1.1 import.log, NONE, 1.1 josm, NONE, 1.1 josm-0-add_javadoc.patch, NONE, 1.1 josm-0-bzip2.patch, NONE, 1.1 josm-0-disable_oauth.patch, NONE, 1.1 josm-0-remove_svn_call.patch, NONE, 1.1 josm-generate-tarball.sh, NONE, 1.1 josm.1, NONE, 1.1 josm.desktop, NONE, 1.1 josm.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list